From 69eb9bb4de0a2abb37d3c28ff38faf69d8e96f0a Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 3 Apr 2018 16:01:35 +0200 Subject: [PATCH] Updated to 0.3.0. --- .gitignore | 4 ++++ gen_libs.sh | 18 ++++++++++++----- nheko-drop-flags.patch | 16 +++++++-------- nheko-drop-rpath.patch | 6 +++--- nheko.spec | 46 +++++++++++++++++++++++++----------------- sources | 7 ++++--- 6 files changed, 59 insertions(+), 38 deletions(-) mode change 100755 => 100644 gen_libs.sh diff --git a/.gitignore b/.gitignore index b0626ab..57c54d7 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,7 @@ /nheko-0.2.0.tar.gz /matrix-structs-850100c.tar.gz /nheko-0.2.1.tar.gz +/header_only-f3b7019.tar.gz +/matrix-structs-7d5d5f7.tar.gz +/nheko-0.3.0.tar.gz +/tweeny-b94ce07.tar.gz diff --git a/gen_libs.sh b/gen_libs.sh old mode 100755 new mode 100644 index 28f31b2..fdd8c83 --- a/gen_libs.sh +++ b/gen_libs.sh @@ -1,16 +1,24 @@ #!/bin/sh set -e +echo -n "Setting some constants..." +RESDIR=include +echo " Done." + echo -n "Downloading header-only libraries..." -mkdir deps -wget https://github.com/nlohmann/json/releases/download/v3.1.1/json.hpp -O deps/json.hpp 2> /dev/null -wget https://github.com/mpark/variant/releases/download/v1.3.0/variant.hpp -O deps/variant.hpp 2> /dev/null +mkdir $RESDIR +wget https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp -O $RESDIR/json.hpp 2> /dev/null +wget https://github.com/mpark/variant/releases/download/v1.3.0/variant.hpp -O $RESDIR/variant.hpp 2> /dev/null echo " Done." echo -n "Generating tarball..." -tar czf header_only.tar.gz deps +nf=header_only-$(cat $RESDIR/*.hpp | sha256sum | awk '{print substr ($1, 0, 7)}').tar.gz +tar czf header_only.tar.gz $RESDIR +mv header_only.tar.gz $nf echo " Done." echo -n "Removing temporary files..." -rm -rf deps +rm -rf $RESDIR echo " Done." + +echo "Result: $nf" diff --git a/nheko-drop-flags.patch b/nheko-drop-flags.patch index 79d5204..8ca67a7 100644 --- a/nheko-drop-flags.patch +++ b/nheko-drop-flags.patch @@ -1,19 +1,17 @@ -From 52f116af8325656a013688f98d84f54cb0dac817 Mon Sep 17 00:00:00 2001 +From 4c4d87839de905e175a34684e3b78247461bd5d2 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 12 Dec 2017 15:25:45 +0100 Subject: [PATCH 1/2] Completely remove additional CXXFLAGS. --- - CMakeLists.txt | 7 ------- + cmake/CompilerFlags.cmake | 7 ------- 1 file changed, 7 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3f0c44e..611a59a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -110,13 +110,6 @@ set(PROJECT_VERSION ${CPACK_PACKAGE_VERSION}) - message(STATUS "Version: ${PROJECT_VERSION}") - +diff --git a/cmake/CompilerFlags.cmake b/cmake/CompilerFlags.cmake +index 2aa92e5..d27e009 100644 +--- a/cmake/CompilerFlags.cmake ++++ b/cmake/CompilerFlags.cmake +@@ -1,11 +1,4 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \ - -Wall \ diff --git a/nheko-drop-rpath.patch b/nheko-drop-rpath.patch index f83d746..add1461 100644 --- a/nheko-drop-rpath.patch +++ b/nheko-drop-rpath.patch @@ -1,4 +1,4 @@ -From f6e9832f0f47897b98d0e862a0a23eff2f5aa800 Mon Sep 17 00:00:00 2001 +From ec7739a80fef30949b1997d5d512f2a66b984bb5 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sat, 16 Dec 2017 18:20:43 +0100 Subject: [PATCH 2/2] Remove rpath. @@ -8,10 +8,10 @@ Subject: [PATCH 2/2] Remove rpath. 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 611a59a..d108dc2 100644 +index 69daf7e..6943b6f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -358,3 +358,4 @@ if(UNIX AND NOT APPLE) +@@ -344,3 +344,4 @@ if(UNIX AND NOT APPLE) COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) endif() endif() diff --git a/nheko.spec b/nheko.spec index c35dc1e..f0bf53b 100644 --- a/nheko.spec +++ b/nheko.spec @@ -3,12 +3,16 @@ %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) # Git revision of matrix-structs... -%global commit2 850100c0ac2b5a04720b2a1f09270749bf99f7dd +%global commit2 7d5d5f7d5f35bc27f168d0f9528844022232281c %global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) +# Git revision of tweeny... +%global commit3 b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf +%global shortcommit3 %(c=%{commit3}; echo ${c:0:7}) + # Due to GCC 7.3.1 regression https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84785 -# build under Fedora <= 28 using clang. -%if 0%{?fedora} < 28 +# build under some Fedora releases using clang. +%if 0%{?fedora} == 27 %bcond_without clang %else %bcond_with clang @@ -16,15 +20,16 @@ Summary: Desktop client for the Matrix protocol Name: nheko -Version: 0.2.1 +Version: 0.3.0 Release: 1%{?dist} # Application and 3rd-party modules licensing: # * S0 - GPLv3+ -- main source; # * S1 (lmdbxx) - Public Domain -- build-time dependency (header-only); # * S2 (matrix-structs) - Public Domain -- build-time dependency; -# * S3 (json) - MIT -- build-time dependency (header-only); -# * S3 (variant) - Boost 1.0 -- build-time dependency (header-only). +# * S3 (tweeny) - MIT -- build-time dependency (header-only); +# * S4 (json) - MIT -- build-time dependency (header-only); +# * S4 (variant) - Boost 1.0 -- build-time dependency (header-only). # Bundled resources licensing: # * emojione-android fonts - CC by (v4.0) -- bundled resource; @@ -36,20 +41,13 @@ URL: https://github.com/mujx/nheko Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: https://github.com/bendiken/lmdbxx/archive/%{commit1}.tar.gz#/lmdbxx-%{shortcommit1}.tar.gz Source2: https://github.com/mujx/matrix-structs/archive/%{commit2}.tar.gz#/matrix-structs-%{shortcommit2}.tar.gz -Source3: header_only.tar.gz -Source4: gen_libs.sh +Source3: https://github.com/mobius3/tweeny/archive/%{commit3}.tar.gz#/tweeny-%{shortcommit3}.tar.gz +Source4: header_only-f3b7019.tar.gz +Source5: gen_libs.sh Patch0: %{name}-drop-flags.patch Patch1: %{name}-drop-rpath.patch -%if %{with clang} -BuildRequires: clang -BuildRequires: llvm -%else -BuildRequires: gcc-c++ -BuildRequires: gcc -%endif - BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Network) BuildRequires: cmake(Qt5Multimedia) @@ -60,8 +58,15 @@ BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: ninja-build BuildRequires: lmdb-devel +BuildRequires: gcc-c++ BuildRequires: doxygen BuildRequires: cmake +BuildRequires: gcc + +%if %{with clang} +BuildRequires: clang +BuildRequires: llvm +%endif Requires: hicolor-icon-theme @@ -81,10 +86,12 @@ pushd ".third-party" mv lmdbxx-%{commit1} lmdbxx tar -xf %{SOURCE2} mv matrix-structs-%{commit2} matrix_structs + tar -xf %{SOURCE3} + mv tweeny-%{commit3} tweeny pushd matrix_structs sed -i 's@add_library(${LIBRARY_NAME} ${SRC})@add_library(${LIBRARY_NAME} STATIC ${SRC})@g' CMakeLists.txt - sed -i '/-Werror/d' CMakeLists.txt - tar -xf %{SOURCE3} + sed -i '/-Werror/d' cmake/CompilerFlags.cmake + tar -xf %{SOURCE4} popd popd @@ -123,6 +130,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Tue Apr 03 2018 Vitaly Zaitsev - 0.3.0-1 +- Updated to version 0.3.0. + * Wed Mar 14 2018 Vitaly Zaitsev - 0.2.1-1 - Updated to version 0.2.1. diff --git a/sources b/sources index 48b70f0..4d42cac 100644 --- a/sources +++ b/sources @@ -1,4 +1,5 @@ -SHA512 (header_only.tar.gz) = 96cb007d70b764f3a6d022cf55dd415061b4d310a0f318e080fe4df8891e4b880e9eb524161ac977be0086d017190b7d62aa79617f1329ae775c6c8d43adefc5 +SHA512 (header_only-f3b7019.tar.gz) = 8dd8a43c9cdb34992f95dd1efa6135759fbb6d0882388a25f2753855fa45b5bbc18ba2f295b5eb3c9bc08c76583a2532ead473191d9951de6d077863ff2d2909 SHA512 (lmdbxx-0b43ca8.tar.gz) = 025a945288a398b09549c91c98509a57912f8614c14b476e7c8d4fb0dc8fc1288fa1b3a33567cccea474277a1c48b3701f2df31e8a6acc851eb9549a9822f074 -SHA512 (matrix-structs-850100c.tar.gz) = 0cd10c865528ed5c5d80c889b7d9fc315796e12b69476696f7e10e745a7774c2a5866fc6de0a10b43ef4de2fb71bf3211899f7c68fa354ae013e28647decc899 -SHA512 (nheko-0.2.1.tar.gz) = 7d08c5c561c0388756b663da98b209c3074b61f5743cefa8f1ad21e3184b0de3973a8a6b129a0f1f602e6dbb3c99d7f0cf47e394a4c9527086a250aff7ca5b85 +SHA512 (matrix-structs-7d5d5f7.tar.gz) = a9e0d1140400ce267c4a519d17d8e3f689a5447bbadf164155ee713e5bde49d037b7148883d4dbce365abe747449774738ac5c26e58f91c239bdb5f1fad352c1 +SHA512 (nheko-0.3.0.tar.gz) = 303c5fae4ec6552da42e5a2386fc18ebd8fed62fbc5d559d321c8d8feef4e62d3f3ea16172b9751e7712597155f2ca878d1fcee469a5c944b75f122fb269be3d +SHA512 (tweeny-b94ce07.tar.gz) = 365d51311e8738f16c8b17e29fa950a1f62622c9f844d847675e36536267091fb554d8a87f89fb1a659defe7ebe30109b7630cc44753079039028d355b60f9db