!22 update to 5.10.11

From: @leeffo 
Reviewed-by: @HelloWorld_lvcongqing 
Signed-off-by: @HelloWorld_lvcongqing
This commit is contained in:
openeuler-ci-bot 2023-04-10 03:11:36 +00:00 committed by Gitee
commit ac07c25d2f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 42 additions and 12 deletions

View File

@ -1,6 +1,6 @@
From e72e2420e9aeeb3aaa8216dfb533770bee59e0ed Mon Sep 17 00:00:00 2001
From c17c7718cd2bfd07913c3aafcd029cb96fea3a6c Mon Sep 17 00:00:00 2001
From: leeffo <leeffo@yeah.net>
Date: Tue, 14 Mar 2023 13:52:27 +0800
Date: Thu, 30 Mar 2023 15:00:52 +0800
Subject: [PATCH] feat: enable debuginfo
---
@ -9,21 +9,21 @@ Subject: [PATCH] feat: enable debuginfo
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b0e943..7df476b 100644
index d90f40f..8f4531f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,8 @@ cmake_minimum_required(VERSION 3.9.5)
set(EXE_NAME compressor)
project(${EXE_NAME})
@@ -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_BUILD_TYPE "Debug")
+SET(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -O0 -Wall -g2 -ggdb")
# 添加c++ 11标准支持
@@ -15,7 +15,7 @@ set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -std=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")
@ -33,11 +33,11 @@ index 6b0e943..7df476b 100644
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 d6fa523..bff647b 100644
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 ${PROJECT_SOURCE_DIR}/test_output/)
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")

View File

@ -0,0 +1,25 @@
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,13 +1,14 @@
%define specrelease 3
%define specrelease 1
Name: deepin-compressor
Version: 5.10.5
Version: 5.10.11
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
@ -91,6 +92,9 @@ echo "%{_libdir}/%{name}/plugins/" > %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{
/sbin/ldconfig
%changelog
* Thu Mar 30 2023 liweiganga <liweiganga@uniontech.com> - 5.10.11-1
- update: update to 5.10.11
* Tue Mar 14 2023 liweigang <liweiganga@uniontech.com> - 5.10.5-3
- feat: remove rpath
@ -114,3 +118,4 @@ echo "%{_libdir}/%{name}/plugins/" > %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{
* Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.6.9-1
- Package init