Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/files/
Date: Sun, 04 Sep 2016 13:10:12
Message-Id: 1472994518.a1aaf300f55a4ae6a5d7cf50ca49951365ea4339.soap@gentoo
1 commit: a1aaf300f55a4ae6a5d7cf50ca49951365ea4339
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sat Sep 3 15:56:15 2016 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 4 13:08:38 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1aaf300
7
8 dev-libs/Ice: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/2223
11
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 dev-libs/Ice/files/Ice-3.4.1-db5.patch | 16 ----------------
15 dev-libs/Ice/files/Ice-3.4.2-gcc46.patch | 10 ----------
16 2 files changed, 26 deletions(-)
17
18 diff --git a/dev-libs/Ice/files/Ice-3.4.1-db5.patch b/dev-libs/Ice/files/Ice-3.4.1-db5.patch
19 deleted file mode 100644
20 index 44183ae..00000000
21 --- a/dev-libs/Ice/files/Ice-3.4.1-db5.patch
22 +++ /dev/null
23 @@ -1,16 +0,0 @@
24 ---- ./cpp/src/Freeze/MapI.cpp
25 -+++ ./cpp/src/Freeze/MapI.cpp
26 -@@ -1487,10 +1487,10 @@ Freeze::MapHelperI::size() const
27 -
28 - try
29 - {
30 --#if DB_VERSION_MAJOR != 4
31 --#error Freeze requires DB 4.x
32 -+#if DB_VERSION_MAJOR < 4
33 -+#error Freeze requires DB 4.x or greater
34 - #endif
35 --#if DB_VERSION_MINOR < 3
36 -+#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 3
37 - _db->stat(&s, 0);
38 - #else
39 - _db->stat(_connection->dbTxn(), &s, 0);
40 \ No newline at end of file
41
42 diff --git a/dev-libs/Ice/files/Ice-3.4.2-gcc46.patch b/dev-libs/Ice/files/Ice-3.4.2-gcc46.patch
43 deleted file mode 100644
44 index a047c6e..00000000
45 --- a/dev-libs/Ice/files/Ice-3.4.2-gcc46.patch
46 +++ /dev/null
47 @@ -1,10 +0,0 @@
48 ---- Ice-3.4.1.old/cpp/include/Ice/Buffer.h 2010-06-03 17:48:33.000000000 +0100
49 -+++ Ice-3.4.1.old/cpp/include/Ice/Buffer.h 2011-07-20 13:20:04.000000000 +0100
50 -@@ -11,6 +11,7 @@
51 - #define ICEE_BUFFER_H
52 -
53 - #include <Ice/Config.h>
54 -+#include <cstddef>
55 -
56 - namespace IceInternal
57 - {