From 2f7acf28de05c974fa9eb54a1fdfed8b0fcb452e Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Wed, 29 Apr 2020 20:49:43 +0200 Subject: [PATCH] upgrading package: libcbor 0.6.1 -> 0.7.0 --- libcbor/libcbor.patch | 35 ++++++++++++++++------------------- libcbor/libcbor.spec | 4 ++-- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/libcbor/libcbor.patch b/libcbor/libcbor.patch index 3e38a68e30..b9e74c41e7 100644 --- a/libcbor/libcbor.patch +++ b/libcbor/libcbor.patch @@ -1,38 +1,35 @@ Index: CMakeLists.txt ---- CMakeLists.txt.orig 2020-03-26 22:12:22.000000000 +0100 -+++ CMakeLists.txt 2020-03-27 20:52:09.105414000 +0100 -@@ -69,7 +69,7 @@ +--- CMakeLists.txt.orig 2020-04-29 08:14:33.403776000 +0200 ++++ CMakeLists.txt 2020-04-29 20:49:30.600909000 +0200 +@@ -70,7 +70,7 @@ set(CBOR_RESTRICT_SPECIFIER "restrict") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -Wall -g -ggdb -DDEBUG=true") -- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -flto -Wall -DNDEBUG") +- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -Wall -DNDEBUG") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -DNDEBUG") if(SANITIZE) set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} \ -@@ -79,7 +79,7 @@ - endif() - - set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-g") --set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-flto") -+set(CMAKE_EXE_LINKER_FLAGS_RELEASE "") - - - include(CheckTypeSize) -@@ -125,10 +125,3 @@ - - subdirs(src) +@@ -144,16 +144,3 @@ + set_property(DIRECTORY src PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) + endif(use_lto) -if (WITH_TESTS) - subdirs(test) +- if(use_lto) +- set_property(DIRECTORY test PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) +- endif(use_lto) -endif (WITH_TESTS) - -if (WITH_EXAMPLES) -- subdirs(examples) +- subdirs(examples) +- if(use_lto) +- set_property(DIRECTORY examples PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) +- endif(use_lto) -endif (WITH_EXAMPLES) Index: src/CMakeLists.txt ---- src/CMakeLists.txt.orig 2020-03-27 20:44:11.179147000 +0100 -+++ src/CMakeLists.txt 2020-03-27 20:52:51.972396000 +0100 +--- src/CMakeLists.txt.orig 2020-04-25 14:01:23.000000000 +0200 ++++ src/CMakeLists.txt 2020-04-29 08:14:33.404166000 +0200 @@ -12,23 +12,16 @@ endif() diff --git a/libcbor/libcbor.spec b/libcbor/libcbor.spec index 6a3b900cdb..10314e41b2 100644 --- a/libcbor/libcbor.spec +++ b/libcbor/libcbor.spec @@ -31,8 +31,8 @@ Distribution: OpenPKG Community Class: EVAL Group: Libraries License: MIT -Version: 0.6.1 -Release: 20200327 +Version: 0.7.0 +Release: 20200429 # list of sources Source0: https://github.com/PJK/libcbor/archive/v%{version}.tar.gz