[med-svn] [Git][med-team/charls][master] 7 commits: d/rules: Start building with more agressive warnings

[Mathieu Malaterre (@malat)]

Mathieu Malaterre pushed to branch master at Debian Med / charls


Commits:
171673b3 by Mathieu Malaterre at 2022-01-26T09:56:49+01:00
d/rules: Start building with more agressive warnings

- - - - -
138d82ca by Mathieu Malaterre at 2022-01-26T10:01:03+01:00
d/rules: Start building test again

Issue has been fixed upstream (bogus symbol in shared lib)

- - - - -
04008035 by Mathieu Malaterre at 2022-01-26T10:03:31+01:00
d/rules: Start building applications

They are not installed by default anyway.

- - - - -
fcf5bdbf by Mathieu Malaterre at 2022-01-26T10:16:56+01:00
d/rules: Simplify configuration using dpkg/default.mk

- - - - -
45991c71 by Mathieu Malaterre at 2022-01-26T10:17:32+01:00
d/patches: Hide more symbols since DPKG_GENSYMBOLS_CHECK_LEVEL=4 now

- - - - -
fe39b761 by Mathieu Malaterre at 2022-01-26T10:19:07+01:00
d/patches: Add missing visibility setup

- - - - -
6628b839 by Mathieu Malaterre at 2022-01-26T10:20:25+01:00
d/changelog: Upload 2.3.1+dfsg-1 to unstable

- - - - -


5 changed files:

- debian/changelog
- + debian/patches/inline_visibility.patch
- debian/patches/series
- debian/patches/stl_symbols_hack.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,10 +1,17 @@
-charls (2.3.1+dfsg-1) UNRELEASED; urgency=medium
+charls (2.3.1+dfsg-1) unstable; urgency=medium
 
+  * Team upload.
   * d/patches: Refactor patch for upstream submission
   * d/patches: Simplify std c++ version setup
   * New upstream version 2.3.1+dfsg
-
- -- Mathieu Malaterre <malat at debian.org>  Wed, 26 Jan 2022 09:43:33 +0100
+  * d/rules: Start building with more agressive warnings
+  * d/rules: Start building test again
+  * d/rules: Start building applications
+  * d/rules: Simplify configuration using dpkg/default.mk
+  * d/patches: Hide more symbols since DPKG_GENSYMBOLS_CHECK_LEVEL=4 now
+  * d/patches: Add missing visibility setup
+
+ -- Mathieu Malaterre <malat at debian.org>  Wed, 26 Jan 2022 10:20:00 +0100
 
 charls (2.3.0+dfsg-1) unstable; urgency=medium
 


=====================================
debian/patches/inline_visibility.patch
=====================================
@@ -0,0 +1,16 @@
+Description: Add setting for VISIBILITY_INLINES_HIDDEN
+Author: Mathieu Malaterre <malat at debian.org>
+Origin: upstream
+Forwarded: no
+Last-Update: 2022-01-26
+
+--- charls-2.3.1+dfsg.orig/src/CMakeLists.txt
++++ charls-2.3.1+dfsg/src/CMakeLists.txt
+@@ -65,6 +65,7 @@ foreach(header HEADERS)
+ endforeach()
+ 
+ set_target_properties(charls PROPERTIES CXX_VISIBILITY_PRESET hidden)
++set_target_properties(charls PROPERTIES VISIBILITY_INLINES_HIDDEN 1)
+ set_property(TARGET charls PROPERTY PUBLIC_HEADER ${HEADERS})
+ 
+ set_property(TARGET charls PROPERTY LINK_FLAGS "-Wl,--version-script=../charls.version")


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 stl_symbols_hack.patch
 noexplicitstd.patch
+inline_visibility.patch


=====================================
debian/patches/stl_symbols_hack.patch
=====================================
@@ -7,7 +7,7 @@ Index: charls/charls.version
 ===================================================================
 --- /dev/null
 +++ charls/charls.version
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,22 @@
 +{
 +  global:
 +    JpegLs*;
@@ -27,6 +27,7 @@ Index: charls/charls.version
 +    # about this.
 +    extern "C++" {
 +      *std::*;
++      __gnu_cxx::*;
 +    };
 +};
 Index: charls/src/CMakeLists.txt


=====================================
debian/rules
=====================================
@@ -1,20 +1,18 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--version-script=../exports.version
-export DEB_CFLAGS_MAINT_APPEND = -fvisibility=hidden -fvisibility-inlines-hidden
-export DEB_CXXFLAGS_MAINT_APPEND = -fvisibility=hidden -fvisibility-inlines-hidden
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/default.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
-# SAMPLES/TESTS should be OFF by default:
-# https://github.com/team-charls/charls/issues/81#issuecomment-716385532
-CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \
+# SAMPLES should not be installed:
+# https://github.com/team-charls/charls/blob/master/samples/README.md
+CMAKE_EXTRA_FLAGS += \
  -DBUILD_SHARED_LIBS:BOOL=ON \
- -DCHARLS_BUILD_SAMPLES:BOOL=OFF \
- -DCHARLS_BUILD_TESTS:BOOL=OFF \
+ -DCHARLS_BUILD_SAMPLES:BOOL=ON \
+ -DCHARLS_BUILD_TESTS:BOOL=ON \
+ -DCHARLS_PEDANTIC_WARNINGS:BOOL=ON
 
 %:
 	dh $@ --buildsystem=cmake



View it on GitLab: https://salsa.debian.org/med-team/charls/-/compare/15213f5e410574c3e55e5771c92a27e5f3805934...6628b8390f8c2defb19679d9b079eb8636771cfd

-- 
View it on GitLab: https://salsa.debian.org/med-team/charls/-/compare/15213f5e410574c3e55e5771c92a27e5f3805934...6628b8390f8c2defb19679d9b079eb8636771cfd
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220126/ee08aed0/attachment-0001.htm>