1 |
commit: 8d6c764e744f6ef30074fdd68d03843eeff6c159 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Feb 12 16:28:29 2019 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 27 05:35:27 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d6c764e |
7 |
|
8 |
dev-db/mysql-connector-c++: remove unused patches |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
12 |
|
13 |
.../mysql-connector-c++-1.1.3-fix-cmake.patch | 123 --------------------- |
14 |
.../mysql-connector-c++-1.1.5-fix-mariadb.patch | 45 -------- |
15 |
2 files changed, 168 deletions(-) |
16 |
|
17 |
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.3-fix-cmake.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.3-fix-cmake.patch |
18 |
deleted file mode 100644 |
19 |
index 5f0669ca338..00000000000 |
20 |
--- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.3-fix-cmake.patch |
21 |
+++ /dev/null |
22 |
@@ -1,123 +0,0 @@ |
23 |
---- a/CMakeLists.txt 2014-05-04 21:27:59.000000000 -0400 |
24 |
-+++ b/CMakeLists.txt 2014-05-04 21:47:31.460572470 -0400 |
25 |
-@@ -38,7 +38,7 @@ |
26 |
- |
27 |
- if(COMMAND cmake_policy AND POLICY CMP0015) |
28 |
- cmake_policy(SET CMP0015 NEW) |
29 |
--endif(COMMAND cmake_policy) |
30 |
-+endif(COMMAND cmake_policy AND POLICY CMP0015) |
31 |
- |
32 |
- #----------------- |
33 |
- # CPPFLAGS, CXXFLAGS and LDFLAGS from the environment |
34 |
-@@ -258,14 +258,14 @@ |
35 |
- ${CPACK_RESOURCE_FILE_LICENSE} |
36 |
- "${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt" |
37 |
- "${CMAKE_SOURCE_DIR}/ANNOUNCEMENT" |
38 |
-- DESTINATION "." OPTIONAL) |
39 |
-+ DESTINATION "${INSTALL_DOCS}" OPTIONAL) |
40 |
- |
41 |
- SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/" |
42 |
- ".cmake$" "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile" |
43 |
- "install_manifest.txt") |
44 |
- SET(PRJ_COMMON_IGNORE_FILES ${COMMON_IGNORE_FILES} "ANNOUNCEMENT_102_ALPHA" "ANNOUNCEMENT_103_ALPHA" "ANNOUNCEMENT_104_BETA" "ANNOUNCEMENT_105_GA" "ANNOUNCEMENT_110_GA" "ANNOUNCEMENT_111_GA" "ANNOUNCEMENT_DRAFT" ) |
45 |
- |
46 |
--SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "./cppconn/config.h$" "./driver/nativeapi/binding_config.h$") |
47 |
-+SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/nativeapi/binding_config.h$") |
48 |
- SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" ) |
49 |
- SET(CPACK_SOURCE_GENERATOR "TGZ") |
50 |
- |
51 |
-@@ -292,10 +292,6 @@ |
52 |
- ADD_SUBDIRECTORY(cppconn) |
53 |
- ADD_SUBDIRECTORY(driver) |
54 |
- ADD_SUBDIRECTORY(examples) |
55 |
--ADD_SUBDIRECTORY(test) |
56 |
--ADD_SUBDIRECTORY(test/framework) |
57 |
--ADD_SUBDIRECTORY(test/CJUnitTestsPort) |
58 |
--ADD_SUBDIRECTORY(test/unit) |
59 |
- |
60 |
- IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") |
61 |
- # see also README |
62 |
---- a/FindMySQL.cm 2014-05-04 22:20:50.000000000 -0400 |
63 |
-+++ b/FindMySQL.cm 2014-05-04 22:21:40.325384447 -0400 |
64 |
-@@ -58,7 +58,7 @@ |
65 |
- EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags" |
66 |
- OUTPUT_VARIABLE _mysql_config_output |
67 |
- ) |
68 |
-- STRING(REGEX MATCHALL "-m([^\r\n]+)" MYSQL_LINK_FLAGS "${_mysql_config_output}") |
69 |
-+ STRING(REGEX MATCHALL " -m([^\r\n]+)" MYSQL_LINK_FLAGS "${_mysql_config_output}") |
70 |
- STRING(REGEX REPLACE "[\r\n]$" "" MYSQL_CXXFLAGS "${_mysql_config_output}") |
71 |
- # ADD_DEFINITIONS("${MYSQL_CXXFLAGS}") |
72 |
- ELSE (MYSQL_CONFIG_EXECUTABLE AND NOT WIN32) |
73 |
-diff -urN a/cppconn/CMakeLists.txt b/cppconn/CMakeLists.txt |
74 |
---- a/cppconn/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200 |
75 |
-+++ b/cppconn/CMakeLists.txt 2011-07-30 14:10:34.000000000 +0200 |
76 |
-@@ -55,7 +55,7 @@ |
77 |
- |
78 |
- SET(MYSQLCPPCONN_INSTALL_HEADERS |
79 |
- build_config.h |
80 |
-- config.h |
81 |
-+ ${CMAKE_CURRENT_BINARY_DIR}/config.h |
82 |
- connection.h |
83 |
- datatype.h |
84 |
- driver.h |
85 |
-diff -urN mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt mysql-connector-c++-1.1.0/driver/CMakeLists.txt |
86 |
---- a/driver/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200 |
87 |
-+++ b/driver/CMakeLists.txt 2011-07-30 13:20:36.000000000 +0200 |
88 |
-@@ -26,6 +26,9 @@ |
89 |
- |
90 |
- INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}) |
91 |
- INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn) |
92 |
-+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}) |
93 |
-+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn) |
94 |
-+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi) |
95 |
- INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}) |
96 |
- MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}") |
97 |
- |
98 |
-@@ -149,20 +152,22 @@ |
99 |
- nativeapi/native_statement_wrapper.h |
100 |
- nativeapi/mysql_native_resultset_wrapper.h |
101 |
- nativeapi/native_resultset_wrapper.h |
102 |
-- ../cppconn/warning.h |
103 |
-- ../cppconn/statement.h |
104 |
-- ../cppconn/sqlstring.h |
105 |
-- ../cppconn/resultset_metadata.h |
106 |
-- ../cppconn/resultset.h |
107 |
-- ../cppconn/prepared_statement.h |
108 |
-- ../cppconn/parameter_metadata.h |
109 |
-- ../cppconn/metadata.h |
110 |
-- ../cppconn/exception.h |
111 |
-- ../cppconn/driver.h |
112 |
-- ../cppconn/datatype.h |
113 |
-- ../cppconn/connection.h |
114 |
-- ../cppconn/config.h |
115 |
-- ../cppconn/build_config.h |
116 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/warning.h |
117 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/statement.h |
118 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/sqlstring.h |
119 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset_metadata.h |
120 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset.h |
121 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/prepared_statement.h |
122 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/parameter_metadata.h |
123 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/metadata.h |
124 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/exception.h |
125 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/driver.h |
126 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/datatype.h |
127 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/connection.h |
128 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h |
129 |
-+ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/config.h |
130 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/build_config.h |
131 |
-+ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/build_config.h |
132 |
- |
133 |
- ) |
134 |
- |
135 |
-@@ -271,8 +276,8 @@ |
136 |
- ) |
137 |
- ELSE(WIN32) |
138 |
- INSTALL(TARGETS mysqlcppconn mysqlcppconn-static |
139 |
-- LIBRARY DESTINATION lib |
140 |
-- ARCHIVE DESTINATION lib |
141 |
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} |
142 |
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} |
143 |
- ) |
144 |
- ENDIF(WIN32) |
145 |
- |
146 |
|
147 |
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-mariadb.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-mariadb.patch |
148 |
deleted file mode 100644 |
149 |
index fa36e3bad93..00000000000 |
150 |
--- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-mariadb.patch |
151 |
+++ /dev/null |
152 |
@@ -1,45 +0,0 @@ |
153 |
-diff -aruN a/driver/nativeapi/libmysql_static_proxy.cpp b/driver/nativeapi/libmysql_static_proxy.cpp |
154 |
---- a/driver/nativeapi/libmysql_static_proxy.cpp 2014-11-19 08:37:11.000000000 -0500 |
155 |
-+++ b/driver/nativeapi/libmysql_static_proxy.cpp 2015-02-21 22:19:50.119234140 -0500 |
156 |
-@@ -319,7 +319,7 @@ |
157 |
- int |
158 |
- LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option, const void *arg) |
159 |
- { |
160 |
--#if MYSQL_VERSION_ID >= 50703 |
161 |
-+#if MYSQL_VERSION_ID >= 50703 && !defined( MARIADB_BASE_VERSION ) |
162 |
- if (::mysql_get_option(mysql, option, arg)) { |
163 |
- throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()"); |
164 |
- } else { |
165 |
-diff -aruN a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp |
166 |
---- a/driver/mysql_connection.cpp 2014-11-19 08:37:11.000000000 -0500 |
167 |
-+++ b/driver/mysql_connection.cpp 2015-02-21 22:28:48.920210376 -0500 |
168 |
-@@ -1015,6 +1015,7 @@ |
169 |
- MY_CHARSET_INFO cs; |
170 |
- proxy->get_character_set_info(&cs); |
171 |
- *(static_cast<int *>(optionValue)) = cs.mbmaxlen; |
172 |
-+#ifndef MARIADB_BASE_VERSION |
173 |
- /* mysql_get_option() was added in mysql 5.7.3 version */ |
174 |
- } else if ( proxy->get_server_version() >= 50703 ) { |
175 |
- try { |
176 |
-@@ -1029,6 +1030,7 @@ |
177 |
- CPP_ERR_FMT("Unsupported option : %d:(%s) %s", proxy->errNo(), proxy->sqlstate().c_str(), proxy->error().c_str()); |
178 |
- throw e; |
179 |
- } |
180 |
-+#endif /* MARIADB_BASE_VERSION */ |
181 |
- } |
182 |
- } |
183 |
- /* }}} */ |
184 |
-@@ -1046,11 +1048,13 @@ |
185 |
- MY_CHARSET_INFO cs; |
186 |
- proxy->get_character_set_info(&cs); |
187 |
- return cs.dir ? sql::SQLString(cs.dir) : ""; |
188 |
-+#ifndef MARIADB_BASE_VERSION |
189 |
- } else if ( proxy->get_server_version() >= 50703 ) { |
190 |
- const char* optionValue= NULL; |
191 |
- if (GET_CONN_OPTION(optionName, &optionValue, stringOptions)) { |
192 |
- return optionValue ? sql::SQLString(optionValue) : ""; |
193 |
- } |
194 |
-+#endif /* MARIADB_BASE_VERSION */ |
195 |
- } |
196 |
- return ""; |
197 |
- } |