From 427fefa8f16f89e3fd8dbe0e202ae725bd7a4dcd31bc02208eb00d1155dd61f9 Mon Sep 17 00:00:00 2001 From: Xu Zhao Date: Sun, 26 Jun 2016 01:33:26 +0000 Subject: [PATCH] Upgrade to 0.9.51 OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=2 --- tdesktop-0.9.48.tar.gz | 3 --- tdesktop-0.9.51.tar.gz | 3 +++ telegram-desktop.changes | 5 +++++ telegram-desktop.spec | 27 +++++++++++++++++++-------- 4 files changed, 27 insertions(+), 11 deletions(-) delete mode 100644 tdesktop-0.9.48.tar.gz create mode 100644 tdesktop-0.9.51.tar.gz create mode 100644 telegram-desktop.changes diff --git a/tdesktop-0.9.48.tar.gz b/tdesktop-0.9.48.tar.gz deleted file mode 100644 index 1c633c0..0000000 --- a/tdesktop-0.9.48.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17a393b57bbb0dad04143a05cad310f6254e88ab70e402781863c1af91aa2846 -size 11412620 diff --git a/tdesktop-0.9.51.tar.gz b/tdesktop-0.9.51.tar.gz new file mode 100644 index 0000000..ff085fa --- /dev/null +++ b/tdesktop-0.9.51.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:246c321c009f7eeb3b616503b19c270688a790bf691feac838b3d91bfd51c55b +size 11482866 diff --git a/telegram-desktop.changes b/telegram-desktop.changes new file mode 100644 index 0000000..e710b0a --- /dev/null +++ b/telegram-desktop.changes @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Mon May 16 17:40:37 UTC 2016 - i@xuzhao.net + +- 0.9.48 Initial Commit. + diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 36ce968..c0cc270 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -1,6 +1,6 @@ Name: telegram-desktop Summary: A new era of messaging -Version: 0.9.48 +Version: 0.9.51 Release: 1 License: GPL-3.0 URL: https://github.com/telegramdesktop/tdesktop @@ -58,14 +58,16 @@ Requires: jasper Telegram Desktop app. A new era of messaging. %prep -%setup -n tdesktop-%{version} &>/dev/null +%setup -n tdesktop-%{version} cp %{_sourcedir}/unity.h ./Telegram/SourceFiles/ sed -i 's/CUSTOM_API_ID//g' "./Telegram/Telegram.pro" sed -i 's,LIBS += /usr/local/lib/libxkbcommon.a,,g' "./Telegram/Telegram.pro" sed -i 's,LIBS += /usr/local/lib/libz.a,LIBS += -lz,g' "./Telegram/Telegram.pro" sed -i 's,,"unity.h",g' "./Telegram/SourceFiles/pspecific_linux.cpp" -sed -i "s,/usr/local/tdesktop/Qt-5.6.0,%{_builddir}/Libraries/QtStatic,g" "./Telegram/Telegram.pro" -sed -i "s,5\.6\.0,5.5.1,g" "./Telegram/Telegram.pro" +sed -i 's/c++11/c++14/g' "./Telegram/Telegram.pro" +# sed -i "s,/usr/local/tdesktop/Qt-5.6.0,%{_builddir}/Libraries/QtStatic,g" "./Telegram/Telegram.pro" +# sed -i "s,5\.6\.0,5.6.0,g" "./Telegram/Telegram.pro" + ( echo "DEFINES += TDESKTOP_DISABLE_AUTOUPDATE" echo "DEFINES += TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" @@ -101,24 +103,31 @@ ln -s %{_builddir}/breakpad-lss ./src/third_party/lss make export PATH="/usr/lib64/libtelegram-qt5/bin/:$PATH" + # Build codegen_style mkdir -p "%{_builddir}/tdesktop/Linux/obj/codegen_style/Debug" cd %{_builddir}/tdesktop/Linux/obj/codegen_style/Debug qmake QMAKE_CXX="g++-5" QMAKE_LINK="g++-5" \ - CONFIG+=debug ../../../../Telegram/build/qmake/codegen_style/codegen_style.pro + QT_TDESKTOP_VERSION="5.6.0" \ + QT_TDESKTOP_PATH="%{_builddir}/Libraries/QtStatic" \ + CONFIG+=debug ../../../../Telegram/build/qmake/codegen_style/codegen_style.pro make # Build codegen_numbers mkdir -p "%{_builddir}/tdesktop/Linux/obj/codegen_numbers/Debug" cd %{_builddir}/tdesktop/Linux/obj/codegen_numbers/Debug qmake QMAKE_CXX="g++-5" QMAKE_LINK="g++-5" \ - CONFIG+=debug ../../../../Telegram/build/qmake/codegen_numbers/codegen_numbers.pro + QT_TDESKTOP_VERSION="5.6.0" \ + QT_TDESKTOP_PATH="%{_builddir}/Libraries/QtStatic" \ + CONFIG+=debug ../../../../Telegram/build/qmake/codegen_numbers/codegen_numbers.pro make # Build MetaLang mkdir -p "%{_builddir}/tdesktop/Linux/DebugIntermediateLang" cd %{_builddir}/tdesktop/Linux/DebugIntermediateLang qmake QMAKE_CXX="g++-5" QMAKE_LINK="g++-5" \ + QT_TDESKTOP_VERSION="5.6.0" \ + QT_TDESKTOP_PATH="%{_builddir}/Libraries/QtStatic" \ CONFIG+=debug "../../Telegram/MetaLang.pro" make @@ -129,8 +138,10 @@ cd %{_builddir}/tdesktop/Linux/ReleaseIntermediate ./../codegen/Debug/codegen_numbers "-o./../../Telegram/GeneratedFiles" "./../../Telegram/Resources/numbers.txt" ./../DebugLang/MetaLang -lang_in ./../../Telegram/Resources/langs/lang.strings -lang_out ./../../Telegram/GeneratedFiles/lang_auto -qmake QMAKE_CXX="g++-5" QMAKE_LINK="g++-5" \ - CONFIG+=release "../../Telegram/Telegram.pro" +qmake QMAKE_CXX="g++-5" QMAKE_LINK="g++-5" CONFIG+=release \ + QT_TDESKTOP_VERSION="5.6.0" \ + QT_TDESKTOP_PATH="%{_builddir}/Libraries/QtStatic" \ + "../../Telegram/Telegram.pro" make %install