From bec512055c9e6057eebfd5862c140850d472e5f6 Mon Sep 17 00:00:00 2001 From: openKylinBot Date: Sat, 14 May 2022 03:24:07 +0800 Subject: [PATCH] changed debian/source/format to native --- debian/patches/add_visibility.patch | 23 ---------------- debian/patches/noexplicitstd.patch | 24 ----------------- debian/patches/series | 3 --- debian/patches/stl_symbols_hack.patch | 39 --------------------------- debian/source/format | 2 +- 5 files changed, 1 insertion(+), 90 deletions(-) delete mode 100644 debian/patches/add_visibility.patch delete mode 100644 debian/patches/noexplicitstd.patch delete mode 100644 debian/patches/series delete mode 100644 debian/patches/stl_symbols_hack.patch diff --git a/debian/patches/add_visibility.patch b/debian/patches/add_visibility.patch deleted file mode 100644 index e8d879e..0000000 --- a/debian/patches/add_visibility.patch +++ /dev/null @@ -1,23 +0,0 @@ -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(-) - -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) - #if !defined(CHARLS_IMEXPORT) && !defined(_WIN32) --# define CHARLS_IMEXPORT(returntype) returntype -+# define CHARLS_IMEXPORT(returntype) __attribute__ ((visibility ("default"))) returntype - #endif - - // Windows static linking diff --git a/debian/patches/noexplicitstd.patch b/debian/patches/noexplicitstd.patch deleted file mode 100644 index 10b4fb3..0000000 --- a/debian/patches/noexplicitstd.patch +++ /dev/null @@ -1,24 +0,0 @@ -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) - # SET(CMAKE_CXX_FLAGS "-D NDEBUG -O3 -Wall -Wextra -pedantic -fvisibility=hidden -fomit-frame-pointer -momit-leaf-frame-pointer -fweb -ftracer" ) - - # Define GNU C++ defines for both Debug and Release -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Wextra") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") - - # Define specific Debug settings. - set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g") diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 0d1a685..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -add_visibility.patch -stl_symbols_hack.patch -noexplicitstd.patch diff --git a/debian/patches/stl_symbols_hack.patch b/debian/patches/stl_symbols_hack.patch deleted file mode 100644 index 62dbd52..0000000 --- a/debian/patches/stl_symbols_hack.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 @@ -+{ -+global: -+ JpegLs*; -+ extern "C++" { -+ JpegLs*; -+ }; -+local: -+ *; -+}; diff --git a/debian/source/format b/debian/source/format index 163aaf8..89ae9db 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +3.0 (native)