!25 [sync] PR-24: upgrade to version 5.12.13

From: @openeuler-sync-bot 
Reviewed-by: @leeffo 
Signed-off-by: @leeffo
This commit is contained in:
openeuler-ci-bot 2023-08-23 03:02:15 +00:00 committed by Gitee
commit 0aefb46b31
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 4 additions and 78 deletions

View File

@ -1,50 +0,0 @@
From c17c7718cd2bfd07913c3aafcd029cb96fea3a6c Mon Sep 17 00:00:00 2001
From: leeffo <leeffo@yeah.net>
Date: Thu, 30 Mar 2023 15:00:52 +0800
Subject: [PATCH] feat: enable debuginfo
---
CMakeLists.txt | 6 +++---
tests/UnitTest/CMakeLists.txt | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d90f40f..8f4531f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,8 +9,8 @@ if (NOT DEFINED VERSION)
set(VERSION 1.0)
endif ()
-#SET(CMAKE_BUILD_TYPE "Debug")
-#SET(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -O0 -Wall -g2 -ggdb")
+SET(CMAKE_BUILD_TYPE "Debug")
+SET(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -O0 -Wall -g2 -ggdb")
# 添加c++ 11标准支持
@@ -19,7 +19,7 @@ set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -std=c++11" )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--as-needed -fPIE -fPIC") #-Wl,--as-needed 减少无效的库链接,用不到的库需要清理
if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -Wall -g -ggdb -Wl,-rpath=../lib:/usr/lib/deepin-compressor/plugins")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -Wall -g -ggdb")
else()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wl,-O1,-rpath=/usr/lib/deepin-compressor/plugins")
endif()
diff --git a/tests/UnitTest/CMakeLists.txt b/tests/UnitTest/CMakeLists.txt
index da1f34f..4932fab 100644
--- a/tests/UnitTest/CMakeLists.txt
+++ b/tests/UnitTest/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage -fno-acce
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin/tests)
if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -Wall -g -ggdb -Wl,-rpath=\"${LIBRARY_OUTPUT_PATH}\":/usr/lib/deepin-compressor/plugins")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -Wall -g -ggdb")
else()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wl,-O1,-rpath=\"${LIBRARY_OUTPUT_PATH}\":/usr/lib/deepin-compressor/plugins")
endif()
--
2.20.1

View File

@ -1,25 +0,0 @@
From 6cd604ef766ac9764ba4b4ccd966514b55cf83cc Mon Sep 17 00:00:00 2001
From: leeffo <leeffo@yeah.net>
Date: Thu, 30 Mar 2023 15:41:16 +0800
Subject: [PATCH 2/2] feat: fix build error
---
tests/UnitTest/include/gtest/src/stub.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/UnitTest/include/gtest/src/stub.h b/tests/UnitTest/include/gtest/src/stub.h
index 76d6606..79bf963 100644
--- a/tests/UnitTest/include/gtest/src/stub.h
+++ b/tests/UnitTest/include/gtest/src/stub.h
@@ -16,6 +16,8 @@
#include <cstring>
//c++
#include <map>
+#include <iostream>
+using namespace std;
#define ADDR(CLASS_NAME,MEMBER_NAME) (&CLASS_NAME::MEMBER_NAME)
--
2.20.1

Binary file not shown.

Binary file not shown.

View File

@ -1,14 +1,12 @@
%define specrelease 1
Name: deepin-compressor
Version: 5.10.11
Version: 5.12.13
Release: %{specrelease}
Summary: A fast and lightweight application for creating and extracting archives
License: GPLv3+
URL: https://github.com/linuxdeepin/deepin-devicemanager
Source0: %{name}-%{version}.tar.gz
Patch0: 0001-feat-enable-debuginfo.patch
Patch1: 0002-feat-fix-build-error.patch
BuildRequires: gcc-c++
BuildRequires: cmake
@ -92,6 +90,9 @@ echo "%{_libdir}/%{name}/plugins/" > %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{
/sbin/ldconfig
%changelog
* Fri Jul 28 2023 leeffo <liweiganga@uniontech.com> - 5.12.13-1
- upgrade to version 5.12.13
* Thu Mar 30 2023 liweiganga <liweiganga@uniontech.com> - 5.10.11-1
- update: update to 5.10.11