1 |
commit: 236d2ef9901bee9fdcb6763b05cc500a5d2ac127 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 8 10:19:18 2017 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 8 10:28:05 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=236d2ef9 |
7 |
|
8 |
dev-db/xbase: Fix gcc6/7 support (#594174 by Peter Levine), port to eapi6. |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
dev-db/xbase/files/xbase-3.1.2-gcc6.patch | 49 +++++++++++++++++++++++++++++++ |
13 |
dev-db/xbase/files/xbase-3.1.2-gcc7.patch | 34 +++++++++++++++++++++ |
14 |
dev-db/xbase/xbase-3.1.2.ebuild | 39 ++++++++++++++++-------- |
15 |
3 files changed, 109 insertions(+), 13 deletions(-) |
16 |
|
17 |
diff --git a/dev-db/xbase/files/xbase-3.1.2-gcc6.patch b/dev-db/xbase/files/xbase-3.1.2-gcc6.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..8dd4cdaef97 |
20 |
--- /dev/null |
21 |
+++ b/dev-db/xbase/files/xbase-3.1.2-gcc6.patch |
22 |
@@ -0,0 +1,49 @@ |
23 |
+diff -up xbase64-3.1.2/xbase64/xblock.cpp.gcc6 xbase64-3.1.2/xbase64/xblock.cpp |
24 |
+--- xbase64-3.1.2/xbase64/xblock.cpp.gcc6 2016-02-16 16:06:40.146864585 -0500 |
25 |
++++ xbase64-3.1.2/xbase64/xblock.cpp 2016-02-16 16:07:51.137342339 -0500 |
26 |
+@@ -84,7 +84,7 @@ xbLock::xbLock(xbDbf * pdbf) |
27 |
+ TableLockCnt = 0; |
28 |
+ MemoLockCnt = 0; |
29 |
+ IndexLockCnt = 0; |
30 |
+- std::cout << "xbLock constructor" << std::cout; |
31 |
++ std::cout << "xbLock constructor"; |
32 |
+ } |
33 |
+ /*************************************************************************/ |
34 |
+ xbLock::~xbLock() |
35 |
+@@ -169,7 +169,7 @@ else if( LockType == XB_LOCK || LockType |
36 |
+ /*************************************************************************/ |
37 |
+ xbaseLock::xbaseLock( xbDbf * pdbf ) : xbLock( pdbf ) |
38 |
+ { |
39 |
+- std::cout << "xbaseLock constructor" << std::cout; |
40 |
++ std::cout << "xbaseLock constructor"; |
41 |
+ } |
42 |
+ /*************************************************************************/ |
43 |
+ xbShort xbaseLock::LockTableHeader( xbShort LockType ) |
44 |
+@@ -336,7 +336,7 @@ xbShort xbaseLock::LockInit() |
45 |
+ /*************************************************************************/ |
46 |
+ dbaseLock::dbaseLock( xbDbf * pdbf ) : xbLock( pdbf ) |
47 |
+ { |
48 |
+- std::cout << "dbaseLock constructor" << std::cout; |
49 |
++ std::cout << "dbaseLock constructor"; |
50 |
+ } |
51 |
+ /*************************************************************************/ |
52 |
+ xbShort dbaseLock::LockTableHeader( xbShort LockType ) |
53 |
+@@ -460,7 +460,7 @@ xbShort dbaseLock::UnlockAll() |
54 |
+ /*************************************************************************/ |
55 |
+ clipperLock::clipperLock( xbDbf * pdbf ) : xbLock( pdbf ) |
56 |
+ { |
57 |
+- std::cout << "clipperLock constructor" << std::cout; |
58 |
++ std::cout << "clipperLock constructor"; |
59 |
+ } |
60 |
+ /*************************************************************************/ |
61 |
+ xbShort clipperLock::LockTableHeader( xbShort LockType ) |
62 |
+@@ -523,7 +523,7 @@ xbShort clipperLock::UnlockAll() |
63 |
+ /*************************************************************************/ |
64 |
+ foxproLock::foxproLock( xbDbf * pdbf ) : xbLock( pdbf ) |
65 |
+ { |
66 |
+- std::cout << "foxproLock constructor" << std::cout; |
67 |
++ std::cout << "foxproLock constructor"; |
68 |
+ } |
69 |
+ /*************************************************************************/ |
70 |
+ xbShort foxproLock::LockTableHeader( xbShort LockType ) |
71 |
+diff -up xbase64-3.1.2/xbase64/xblock.h.gcc6 xbase64-3.1.2/xbase64/xblock.h |
72 |
|
73 |
diff --git a/dev-db/xbase/files/xbase-3.1.2-gcc7.patch b/dev-db/xbase/files/xbase-3.1.2-gcc7.patch |
74 |
new file mode 100644 |
75 |
index 00000000000..119fb59e168 |
76 |
--- /dev/null |
77 |
+++ b/dev-db/xbase/files/xbase-3.1.2-gcc7.patch |
78 |
@@ -0,0 +1,34 @@ |
79 |
+diff -up xbase64-3.1.2/bin/dbfutil1.cpp.gcc7 xbase64-3.1.2/bin/dbfutil1.cpp |
80 |
+--- xbase64-3.1.2/bin/dbfutil1.cpp.gcc7 2017-02-20 09:59:36.135561103 -0500 |
81 |
++++ xbase64-3.1.2/bin/dbfutil1.cpp 2017-02-20 10:00:32.743218194 -0500 |
82 |
+@@ -157,7 +157,8 @@ void MyClass::SetFilter() |
83 |
+ memset( Expression, 0x00, 512 ); |
84 |
+ while( !strlen( Expression )){ |
85 |
+ std::cout << "Enter filter expression (like AMOUNT<5)" << std::endl; |
86 |
+- gets( Expression ); |
87 |
++ fgets( Expression, sizeof(Expression), stdin ); |
88 |
++ strtok( Expression, "\n" ); |
89 |
+ } |
90 |
+ if( xbf ) |
91 |
+ delete xbf; |
92 |
+@@ -247,7 +248,8 @@ void MyClass::ProcessExpression() |
93 |
+ while( !strstr( exprsn, "QUIT" ) && !strstr( exprsn, "quit" )){ |
94 |
+ |
95 |
+ std::cout << ">"; |
96 |
+- gets( exprsn ); |
97 |
++ fgets( exprsn, sizeof(exprsn), stdin ); |
98 |
++ strtok( exprsn, "\n" ); |
99 |
+ |
100 |
+ if( strstr( exprsn, "HELP" ) || strstr( exprsn, "help" )){ |
101 |
+ std::cout << "** Command Help ***" << std::endl << std::endl; |
102 |
+diff -up xbase64-3.1.2/xbase64/xbase64.h.gcc7 xbase64-3.1.2/xbase64/xbase64.h |
103 |
+--- xbase64-3.1.2/xbase64/xbase64.h.gcc7 2017-02-20 09:49:07.063609482 -0500 |
104 |
++++ xbase64-3.1.2/xbase64/xbase64.h 2017-02-20 09:57:36.586618723 -0500 |
105 |
+@@ -53,6 +53,7 @@ |
106 |
+ #endif |
107 |
+ |
108 |
+ #include <string.h> |
109 |
++#include <cstdio> |
110 |
+ |
111 |
+ #if defined(__WIN32__) |
112 |
+ #include "windows.h" |
113 |
|
114 |
diff --git a/dev-db/xbase/xbase-3.1.2.ebuild b/dev-db/xbase/xbase-3.1.2.ebuild |
115 |
index fda7955bdac..eba9889c70a 100644 |
116 |
--- a/dev-db/xbase/xbase-3.1.2.ebuild |
117 |
+++ b/dev-db/xbase/xbase-3.1.2.ebuild |
118 |
@@ -1,9 +1,8 @@ |
119 |
-# Copyright 1999-2013 Gentoo Foundation |
120 |
+# Copyright 1999-2017 Gentoo Foundation |
121 |
# Distributed under the terms of the GNU General Public License v2 |
122 |
|
123 |
-EAPI=4 |
124 |
-AUTOTOOLS_AUTORECONF=no |
125 |
-inherit autotools-utils |
126 |
+EAPI=6 |
127 |
+inherit autotools ltprune |
128 |
|
129 |
DESCRIPTION="xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library" |
130 |
HOMEPAGE="http://linux.techass.com/projects/xdb/" |
131 |
@@ -17,18 +16,32 @@ IUSE="doc static-libs" |
132 |
S="${WORKDIR}"/${PN}64-${PV} |
133 |
|
134 |
PATCHES=( |
135 |
- "${FILESDIR}"/${P}-fixconfig.patch |
136 |
- "${FILESDIR}"/${P}-gcc44.patch |
137 |
- "${FILESDIR}"/${PN}-2.0.0-ppc.patch |
138 |
- "${FILESDIR}"/${P}-xbnode.patch |
139 |
- "${FILESDIR}"/${P}-lesserg.patch |
140 |
- "${FILESDIR}"/${P}-outofsource.patch |
141 |
- "${FILESDIR}"/${P}-gcc47.patch |
142 |
- "${FILESDIR}"/${P}-gcc-version.patch |
143 |
+ "${FILESDIR}"/${P}-fixconfig.patch |
144 |
+ "${FILESDIR}"/${P}-gcc44.patch |
145 |
+ "${FILESDIR}"/${PN}-2.0.0-ppc.patch |
146 |
+ "${FILESDIR}"/${P}-xbnode.patch |
147 |
+ "${FILESDIR}"/${P}-lesserg.patch |
148 |
+ "${FILESDIR}"/${P}-outofsource.patch |
149 |
+ "${FILESDIR}"/${P}-gcc47.patch |
150 |
+ "${FILESDIR}"/${P}-gcc-version.patch |
151 |
+ "${FILESDIR}"/${P}-gcc6.patch |
152 |
+ "${FILESDIR}"/${P}-gcc7.patch |
153 |
) |
154 |
|
155 |
+src_prepare() { |
156 |
+ default |
157 |
+ mv configure.in configure.ac || die |
158 |
+ eautoreconf |
159 |
+} |
160 |
+ |
161 |
+src_configure() { |
162 |
+ econf $(use_enable static-libs static) |
163 |
+} |
164 |
+ |
165 |
src_install() { |
166 |
- autotools-utils_src_install |
167 |
+ default |
168 |
+ prune_libtool_files |
169 |
+ |
170 |
# media-tv/linuxtv-dvb-apps collision, bug #208596 |
171 |
mv "${ED}/usr/bin/zap" "${ED}/usr/bin/${PN}-zap" || die |