From 446a7df12216315a8e2e7d4f541ccedb40e172d8 Mon Sep 17 00:00:00 2001 From: openKylinBot Date: Sat, 14 May 2022 03:24:07 +0800 Subject: [PATCH] format patches --- debian/patches/add_visibility.patch | 15 +++++++--- debian/patches/noexplicitstd.patch | 12 ++++++-- debian/patches/stl_symbols_hack.patch | 40 +++++++++++++++++---------- 3 files changed, 47 insertions(+), 20 deletions(-) diff --git a/debian/patches/add_visibility.patch b/debian/patches/add_visibility.patch index dce19da..e8d879e 100644 --- a/debian/patches/add_visibility.patch +++ b/debian/patches/add_visibility.patch @@ -1,10 +1,17 @@ -Description: Use GCC Visibility -Author: Mathieu Malaterre +From: Mathieu Malaterre +Date: Sat, 14 May 2022 03:24:06 +0800 +Subject: Use GCC Visibility + Forwarded: no Last-Update: 2019-01-03 +--- + src/charls.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) ---- charls-2.0.0+dfsg.orig/src/charls.h -+++ charls-2.0.0+dfsg/src/charls.h +diff --git a/src/charls.h b/src/charls.h +index 66f6410..8d21352 100644 +--- a/src/charls.h ++++ b/src/charls.h @@ -15,7 +15,7 @@ // Non-windows (static linking) diff --git a/debian/patches/noexplicitstd.patch b/debian/patches/noexplicitstd.patch index 09cc57b..10b4fb3 100644 --- a/debian/patches/noexplicitstd.patch +++ b/debian/patches/noexplicitstd.patch @@ -1,8 +1,16 @@ -Description: Debian buildd wants to use the default c++ standard always (not hardcoded) -Author: Mathieu Malaterre +From: Mathieu Malaterre +Date: Sat, 14 May 2022 03:24:06 +0800 +Subject: Debian buildd wants to use the default c++ standard always (not + hardcoded) + Forwarded: no Last-Update: 2019-01-03 +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0af9fe3..512eb12 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ if (CMAKE_COMPILER_IS_GNUCC) diff --git a/debian/patches/stl_symbols_hack.patch b/debian/patches/stl_symbols_hack.patch index ca108ac..62dbd52 100644 --- a/debian/patches/stl_symbols_hack.patch +++ b/debian/patches/stl_symbols_hack.patch @@ -1,8 +1,30 @@ -Description: Rework the symbol file to hide stl exported symbols - Also add missing header -Author: Mathieu Malaterre -Forwarded: no +From: Mathieu Malaterre +Date: Sat, 14 May 2022 03:24:06 +0800 +Subject: Rework the symbol file to hide stl exported symbols +Also add missing header +Forwarded: no +--- + CMakeLists.txt | 1 + + exports.version | 9 +++++++++ + 2 files changed, 10 insertions(+) + create mode 100644 exports.version + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1aa40a8..0af9fe3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,6 +46,7 @@ set (CHARLS_LIB_MINOR_VERSION 0) + set_target_properties(CharLS PROPERTIES + VERSION ${CHARLS_LIB_MAJOR_VERSION}.${CHARLS_LIB_MINOR_VERSION} + SOVERSION ${CHARLS_LIB_MAJOR_VERSION}) ++set_property(TARGET CharLS PROPERTY LINK_FLAGS "-Wl,--version-script=../exports.version") + + install (TARGETS CharLS RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} +diff --git a/exports.version b/exports.version +new file mode 100644 +index 0000000..a831478 --- /dev/null +++ b/exports.version @@ -0,0 +1,9 @@ @@ -15,13 +37,3 @@ Forwarded: no +local: + *; +}; ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,6 +46,7 @@ set (CHARLS_LIB_MINOR_VERSION 0) - set_target_properties(CharLS PROPERTIES - VERSION ${CHARLS_LIB_MAJOR_VERSION}.${CHARLS_LIB_MINOR_VERSION} - SOVERSION ${CHARLS_LIB_MAJOR_VERSION}) -+set_property(TARGET CharLS PROPERTY LINK_FLAGS "-Wl,--version-script=../exports.version") - - install (TARGETS CharLS RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX}