diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
| commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
| tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-util/xxdiff/files | |
| parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) | |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-util/xxdiff/files')
| -rw-r--r-- | dev-util/xxdiff/files/xxdiff-4.0.1-no-throw-in-dtor.patch | 16 | ||||
| -rw-r--r-- | dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch | 11 |
2 files changed, 0 insertions, 27 deletions
diff --git a/dev-util/xxdiff/files/xxdiff-4.0.1-no-throw-in-dtor.patch b/dev-util/xxdiff/files/xxdiff-4.0.1-no-throw-in-dtor.patch deleted file mode 100644 index 93162cc615b4..000000000000 --- a/dev-util/xxdiff/files/xxdiff-4.0.1-no-throw-in-dtor.patch +++ /dev/null @@ -1,16 +0,0 @@ -Build failure triggers on CXXFLAGS=-Werror=terminate - - cmdline.cpp: In destructor ‘virtual XxCmdline::~XxCmdline()’: - ./defs.h:121:43: error: throw will always call terminate() [-Werror=terminate] - { throw XxInternalError( XX_EXC_PARAMS ); } ^ - cmdline.cpp:369:7: note: in expansion of macro ‘XX_ASSERT’ - -https://bugs.gentoo.org/601018 -diff --git a/src/cmdline.cpp b/src/cmdline.cpp -index 8cb0ac9..174b9a4 100644 ---- a/src/cmdline.cpp -+++ b/src/cmdline.cpp -@@ -368,3 +368,2 @@ XxCmdline::~XxCmdline() - for ( int ii = 0; ii < _nbQtOptions; ++ii ) { -- XX_ASSERT( _qtOptions[ii] != 0 ); - #ifndef WINDOWS diff --git a/dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch b/dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch deleted file mode 100644 index b16a7c4072f9..000000000000 --- a/dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch +++ /dev/null @@ -1,11 +0,0 @@ -In gentoo qt5 already requires c++11 features: - -diff --git a/src/xxdiff.pro b/src/xxdiff.pro -index 32b106b..16fcd1f 100644 ---- a/src/xxdiff.pro -+++ b/src/xxdiff.pro -@@ -113,3 +113,3 @@ irix-n32:QMAKE_CFLAGS_RELEASE += -OPT:Olimit=4000 - # auto_ptr deprecated in C++11, removed in C++17 --linux: QMAKE_CXXFLAGS += -std=c++03 -+linux: QMAKE_CXXFLAGS += -std=c++11 - |