Add patches from PR pkg/53190 for building with newer g++ (4.9+).

3 files changed, 42 insertions, 1 deletions

diff --git a/news/nget/distinfo b/news/nget/distinfo
index 3631a238394..75a43efd783 100644
--- a/news/nget/distinfo
+++ b/news/nget/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2015/11/02 23:49:47 agc Exp $
+$NetBSD: distinfo,v 1.11 2018/11/11 14:11:27 rhialto Exp $
 
 SHA1 (nget-0.27.1.tar.gz) = 80e348dcb65fcb26cbe037598e676f4770cd7ad1
 RMD160 (nget-0.27.1.tar.gz) = b90e3d6e2a33e630144a090f68f9bdd818f5e1bd
@@ -7,6 +7,8 @@ Size (nget-0.27.1.tar.gz) = 490164 bytes
 SHA1 (patch-auto__map_h) = 355d8e02aed69a273a9cf282d6bc868b1b6d1846
 SHA1 (patch-cache.h) = 2b8d07aa2a423e2143bf1482592d192c6378e309
 SHA1 (patch-dupe__file_cc) = 31c550c8b23fd9885dc18aba5da44e108a132123
+SHA1 (patch-etree.cc) = 11af9f43c8ea55e3aa7cef8277cc178aba832b73
+SHA1 (patch-getter.h) = 2743095418b99e249c0084beb14185c22f77ecd4
 SHA1 (patch-lite_h) = 3bb31ed0bb2aad077f0da3d01dc6ae4da89f6eaa
 SHA1 (patch-myregex_cc) = 922f62c50f5fe56a0fb54347eef7a0a8d1a8fc79
 SHA1 (patch-nget.cc) = 94b36db92f6fd34d76b33c47173c2db430f418d7
diff --git a/news/nget/patches/patch-etree.cc b/news/nget/patches/patch-etree.cc
new file mode 100644
index 00000000000..00639f72b33
--- /dev/null
+++ b/news/nget/patches/patch-etree.cc
@@ -0,0 +1,24 @@
+$NetBSD: patch-etree.cc,v 1.1 2018/11/11 14:11:27 rhialto Exp $
+
+Improve const-correctness.
+
+--- etree.cc.orig	2004-05-29 23:00:05.000000000 +0000
++++ etree.cc
+@@ -79,7 +79,7 @@ pred<ClassType> *new_comparison(RetType 
+ 	return new Comparison<Op, MemGetter, RetType, ClassType>(member, v);
+ }
+ template <template <class A, class B> class Op, class ClassType, class RetType>
+-pred<ClassType> *new_comparison(RetType (ClassType::*memberf)(void), RetType v){
++pred<ClassType> *new_comparison(RetType (ClassType::*memberf)(void) const, RetType v){
+ 	return new Comparison<Op, MemfuncGetter, RetType, ClassType>(memberf, v);
+ }
+ template <class ClassType, class getterT, class T2>
+@@ -112,7 +112,7 @@ pred<ClassType> *new_comparison_re(RetTy
+ 	return new Comparison_re<Op, MemGetter, RetType, ClassType>(member, pattern, flags);
+ }
+ template <template <class A, class B> class Op, class ClassType, class RetType>
+-pred<ClassType> *new_comparison_re(RetType (ClassType::*memberf)(void), const char *pattern, int flags){
++pred<ClassType> *new_comparison_re(RetType (ClassType::*memberf)(void) const, const char *pattern, int flags){
+ 	return new Comparison_re<Op, MemfuncGetter, RetType, ClassType>(memberf, pattern, flags);
+ }
+ template <class ClassType, class getterT>
diff --git a/news/nget/patches/patch-getter.h b/news/nget/patches/patch-getter.h
new file mode 100644
index 00000000000..14bfd03a429
--- /dev/null
+++ b/news/nget/patches/patch-getter.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-getter.h,v 1.1 2018/11/11 14:11:27 rhialto Exp $
+
+Improve const-correctness.
+
+--- getter.h.orig	2018-04-16 19:54:17.000000000 +0000
++++ getter.h
+@@ -35,7 +35,7 @@ class MemGetter {
+ template <class RetType, class ClassType>
+ class MemfuncGetter {
+ 	private:
+-		typedef RetType (ClassType::*member_t)(void);
++		typedef RetType (ClassType::*member_t)(void) const;
+ 		member_t member;		
+ 	public:
+ 		typedef RetType T;