[med-svn] [Git][med-team/mash][master] 2 commits: refresh patches

[Sascha Steinbiss]

Sascha Steinbiss pushed to branch master at Debian Med / mash


Commits:
bee79a03 by Sascha Steinbiss at 2018-12-26T14:24:54Z
refresh patches

- - - - -
076de3b2 by Sascha Steinbiss at 2018-12-26T14:25:52Z
raise C++ version support

- - - - -


7 changed files:

- debian/changelog
- + debian/patches/capnp0_7.patch
- debian/patches/drop_memcpy_wrapper.patch
- debian/patches/hardening.patch
- debian/patches/link_dynamically_against_capnp.patch
- debian/patches/parallel.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+mash (2.1-2) unstable; urgency=medium
+
+  * Adjust CXXFLAGS due to new dependency requirements.
+
+ -- Sascha Steinbiss <satta at debian.org>  Wed, 26 Dec 2018 14:17:06 +0000
+
 mash (2.1-1) unstable; urgency=medium
 
   [ Jelmer Vernooij ]


=====================================
debian/patches/capnp0_7.patch
=====================================
@@ -0,0 +1,23 @@
+Description: raise C++ standard to allow building with capnp 0.7
+Author: Sascha Steinbiss <satta at debian.org>
+Bug: https://github.com/marbl/Mash/issues/98
+Last-Update: 2018-12-26
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,7 @@
+ 	AC_MSG_ERROR([Cap'n Proto compiler (capnp) not found.])
+ fi
+ 
+-CPPFLAGS="-I$with_capnp/include -std=c++11"
++CPPFLAGS="-I$with_capnp/include -std=c++14"
+ 
+ AC_CHECK_HEADER(capnp/common.h, [result=1], [result=0])
+ 
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,4 +1,4 @@
+-CXXFLAGS += -O3 -std=c++11 -Isrc -I at capnp@/include -I at mathinc@
++CXXFLAGS += -O3 -std=c++14 -Isrc -I at capnp@/include -I at mathinc@
+ CPPFLAGS += @amcppflags@
+ 
+ UNAME_S=$(shell uname -s)


=====================================
debian/patches/drop_memcpy_wrapper.patch
=====================================
@@ -13,7 +13,7 @@ Author: Sascha Steinbiss <satta at debian.org>
  endif
  
  SOURCES=\
-@@ -35,8 +32,8 @@
+@@ -36,8 +33,8 @@
  
  all : mash libmash.a
  
@@ -24,7 +24,7 @@ Author: Sascha Steinbiss <satta at debian.org>
  
  libmash.a : $(OBJECTS)
  	ar -cr libmash.a $(OBJECTS)
-@@ -50,9 +47,6 @@
+@@ -51,9 +48,6 @@
  %.o : %.c++
  	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
  


=====================================
debian/patches/hardening.patch
=====================================
@@ -3,7 +3,7 @@ Description: add hardening support
 Author: Sascha Steinbiss <satta at debian.org>
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -36,7 +36,7 @@
+@@ -37,7 +37,7 @@
  all : mash libmash.a
  
  mash : libmash.a src/mash/memcpyWrap.o


=====================================
debian/patches/link_dynamically_against_capnp.patch
=====================================
@@ -2,7 +2,7 @@ Description: link dynamically against libcapnp and friends
 Author: Sascha Steinbiss <satta at debian.org>
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -32,8 +32,8 @@
+@@ -33,8 +33,8 @@
  
  all : mash libmash.a
  


=====================================
debian/patches/parallel.patch
=====================================
@@ -7,7 +7,7 @@ Author: Adrian Bunk <bunk at debian.org>
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -47,7 +47,9 @@
+@@ -48,7 +48,9 @@
  %.o : %.c++
  	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
  


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@ use_debian_mathjax.patch
 drop_memcpy_wrapper.patch
 link_dynamically_against_capnp.patch
 parallel.patch
+capnp0_7.patch



View it on GitLab: https://salsa.debian.org/med-team/mash/compare/d1810c6d3289c3e702ef8ecb487412686cef96c4...076de3b2231b779b412ddaa1d8e160203a08f5c5

-- 
View it on GitLab: https://salsa.debian.org/med-team/mash/compare/d1810c6d3289c3e702ef8ecb487412686cef96c4...076de3b2231b779b412ddaa1d8e160203a08f5c5
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/20181226/ca7bd6b6/attachment-0001.html>