diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2017-11-10 06:17:07 +0800 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2017-11-10 06:17:07 +0800 |
| commit | 4ddaaccc1714c5b16b4ade51fe24538175baacaa (patch) | |
| tree | 4ef8c9721b5f85ea245098f1570bc1ae36b02837 /databases | |
| parent | d2abf95cc9162443258c5ebe7c68a8ac15848568 (diff) | |
| download | freebsd-ports-gnome-4ddaaccc1714c5b16b4ade51fe24538175baacaa.tar.gz freebsd-ports-gnome-4ddaaccc1714c5b16b4ade51fe24538175baacaa.tar.zst freebsd-ports-gnome-4ddaaccc1714c5b16b4ade51fe24538175baacaa.zip | |
Fix the context of some patches so that they apply with stricter patch(1)
PR: 223545
With hat: portmgr
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/postgresql-libpqxx3/files/patch-svn_1833 | 45 |
1 files changed, 27 insertions, 18 deletions
diff --git a/databases/postgresql-libpqxx3/files/patch-svn_1833 b/databases/postgresql-libpqxx3/files/patch-svn_1833 index 58c1bc3b3644..5c51da50f243 100644 --- a/databases/postgresql-libpqxx3/files/patch-svn_1833 +++ b/databases/postgresql-libpqxx3/files/patch-svn_1833 @@ -1,42 +1,51 @@ ---- include/pqxx/largeobject.hxx (revision 1706) -+++ include/pqxx/largeobject.hxx (revision 1833) -@@ -397,5 +397,5 @@ +--- ChangeLog.orig 2013-01-17 07:25:02 UTC ++++ ChangeLog +@@ -1,3 +1,8 @@ ++2012-08-03 Jeroen T. Vermeulen <jtv@xs4all.nl> ++ include/pqxx/largeobject.hxx: ++ - Backported fix for #252: clang++ 3.2 compile error. Thanks Amy Troschinetz. ++ src/strconv.cxx: ++ - Backported fix for #253: clang++ 3.2 compile error. Thanks Amy Troschinetz. + 2013-01-17 Jeroen T. Vermeulen <jtv@xs4all.nl> + tools/splitconfig: + - Rewrote in python. +--- include/pqxx/largeobject.hxx.orig 2013-01-17 07:25:00 UTC ++++ include/pqxx/largeobject.hxx +@@ -396,7 +396,7 @@ public: + openmode mode = PGSTD::ios::in | PGSTD::ios::out, size_type BufSize=512) : //[t48] m_BufSize(BufSize), - m_Obj(T, O), + m_Obj(T, O, mode), m_G(0), m_P(0) -@@ -407,5 +407,5 @@ + { initialize(mode); } +@@ -406,7 +406,7 @@ public: + openmode mode = PGSTD::ios::in | PGSTD::ios::out, size_type BufSize=512) : //[t48] m_BufSize(BufSize), - m_Obj(T, O), + m_Obj(T, O, mode), m_G(0), m_P(0) ---- ChangeLog (revision 1825) -+++ ChangeLog (revision 1833) -@@ -1,2 +1,7 @@ -+2012-08-03 Jeroen T. Vermeulen <jtv@xs4all.nl> -+ include/pqxx/largeobject.hxx: -+ - Backported fix for #252: clang++ 3.2 compile error. Thanks Amy Troschinetz. -+ src/strconv.cxx: -+ - Backported fix for #253: clang++ 3.2 compile error. Thanks Amy Troschinetz. - 2012-03-25 Jeroen T. Vermeulen <jtv@xs4all.nl> - test/test002.cxx, test/test007.cxx, test/test011.cxx, test/test012.cxx, ---- src/strconv.cxx (revision 1724) -+++ src/strconv.cxx (revision 1833) -@@ -7,5 +7,5 @@ + { initialize(mode); } +--- src/strconv.cxx.orig 2013-01-17 07:25:01 UTC ++++ src/strconv.cxx +@@ -6,7 +6,7 @@ + * DESCRIPTION * implementation of string conversions * - * Copyright (c) 2008, Jeroen T. Vermeulen <jtv@xs4all.nl> + * Copyright (c) 2008-2012, Jeroen T. Vermeulen <jtv@xs4all.nl> * * See COPYING for copyright license. If you did not receive a file called -@@ -193,5 +193,5 @@ + * COPYING with this source code, please notify the distributor of this mistake, +@@ -230,7 +230,7 @@ template<typename T> inline void from_st + #if defined(PQXX_HAVE_IMBUE) S.imbue(locale("C")); #endif - ok = (S >> result); + ok = static_cast<bool>(S >> result); } break; + } |