From b9cb63a72b27458957fc87b289b4e1cedead292f Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Thu, 24 May 2018 14:31:38 +0200 Subject: [PATCH] Updated to version 0.4.1. --- .gitignore | 2 ++ nheko-drop-flags.patch | 13 +++++++------ nheko-drop-rpath.patch | 8 ++++---- nheko.spec | 7 +++++-- sources | 4 ++-- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index f63c7da..0ebe250 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ /nheko-0.3.1.tar.gz /matrix-structs-690080d.tar.gz /nheko-0.4.0.tar.gz +/matrix-structs-5e57c23.tar.gz +/nheko-0.4.1.tar.gz diff --git a/nheko-drop-flags.patch b/nheko-drop-flags.patch index 470310c..dba77e8 100644 --- a/nheko-drop-flags.patch +++ b/nheko-drop-flags.patch @@ -1,28 +1,29 @@ -From 92c594dbf50352a8618584f42d8934905eb5e012 Mon Sep 17 00:00:00 2001 +From 9f02a742a0a581a10e8d71c3595fda3831e5eff5 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. --- - cmake/CompilerFlags.cmake | 7 ------- - 1 file changed, 7 deletions(-) + cmake/CompilerFlags.cmake | 8 -------- + 1 file changed, 8 deletions(-) diff --git a/cmake/CompilerFlags.cmake b/cmake/CompilerFlags.cmake -index 2aa92e5..d27e009 100644 +index f5860a9..d27e009 100644 --- a/cmake/CompilerFlags.cmake +++ b/cmake/CompilerFlags.cmake -@@ -1,11 +1,4 @@ +@@ -1,12 +1,4 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \ - -Wall \ - -Wextra \ - -Werror \ - -pipe \ +- -Wno-unused-function \ - -pedantic \ - -Wunreachable-code") if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) -- -2.14.3 +2.17.0 diff --git a/nheko-drop-rpath.patch b/nheko-drop-rpath.patch index e5c57e8..650d493 100644 --- a/nheko-drop-rpath.patch +++ b/nheko-drop-rpath.patch @@ -1,4 +1,4 @@ -From 650da4ca0c82934021f1eac29e783597a4ad486f Mon Sep 17 00:00:00 2001 +From b84b4bf375f9148c784abd48ed9b8956d3741ecd 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,14 +8,14 @@ Subject: [PATCH 2/2] Remove rpath. 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4e808dd..83f9ee3 100644 +index df9f83d..fa72732 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -347,3 +347,4 @@ if(UNIX AND NOT APPLE) +@@ -361,3 +361,4 @@ if(UNIX AND NOT APPLE) COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) endif() endif() +set_target_properties(nheko PROPERTIES SKIP_BUILD_RPATH TRUE) -- -2.14.3 +2.17.0 diff --git a/nheko.spec b/nheko.spec index c69163e..1eca965 100644 --- a/nheko.spec +++ b/nheko.spec @@ -3,7 +3,7 @@ %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) # Git revision of matrix-structs... -%global commit2 690080daa3bc1984297c4d7103cde9ea07e2e0b7 +%global commit2 5e57c2385a79b6629d1998fec4a7c0baee23555e %global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) # Git revision of tweeny... @@ -20,7 +20,7 @@ Summary: Desktop client for the Matrix protocol Name: nheko -Version: 0.4.0 +Version: 0.4.1 Release: 1%{?dist} # Application and 3rd-party modules licensing: @@ -131,6 +131,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Thu May 24 2018 Vitaly Zaitsev - 0.4.1-1 +- Updated to version 0.4.1. + * Fri May 04 2018 Vitaly Zaitsev - 0.4.0-1 - Updated to version 0.4.0. diff --git a/sources b/sources index 0f3e5e1..b7a6863 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (header_only-f3b7019.tar.gz) = 8dd8a43c9cdb34992f95dd1efa6135759fbb6d0882388a25f2753855fa45b5bbc18ba2f295b5eb3c9bc08c76583a2532ead473191d9951de6d077863ff2d2909 SHA512 (lmdbxx-0b43ca8.tar.gz) = 025a945288a398b09549c91c98509a57912f8614c14b476e7c8d4fb0dc8fc1288fa1b3a33567cccea474277a1c48b3701f2df31e8a6acc851eb9549a9822f074 -SHA512 (matrix-structs-690080d.tar.gz) = ae6a1a81b1d9eb935890aae513cf84bc4596b1a6b5dcf5067d7b7e3d47dd7cae5c25de1aab159a705f1d460c5761ae536b3c581f854e31e247412e0dc9d331f6 -SHA512 (nheko-0.4.0.tar.gz) = 924c75183f7778b9e15c60334d680171640726fdcb86c6bb06719c4ffb63342e31ad1aa20214b1933ca81eada9c5a2f1b3fadf493e5cf81011253e1aa0f51e17 +SHA512 (matrix-structs-5e57c23.tar.gz) = dd622cd92e311e36c347dad134f11ebc8f5aa172debc8d6a5095324039e018b4c251a8450d01991746afb6566c6520c2de0f4fa64721ecb130caaab954c9120c +SHA512 (nheko-0.4.1.tar.gz) = 4ee444d64b244ae02f0b39cdbcd15386f084eb2973124db0c3b27ac8234b953a6c7dbe78eb90dcc20b9d8d1c7c5c00a7cec7e148bff60407a131bf6b848abcdf SHA512 (tweeny-b94ce07.tar.gz) = 365d51311e8738f16c8b17e29fa950a1f62622c9f844d847675e36536267091fb554d8a87f89fb1a659defe7ebe30109b7630cc44753079039028d355b60f9db