[DO-981] qt package (!15)

Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.tech>
Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/15
This commit is contained in:
Aleksandr Vodyanov
2025-02-13 12:25:48 +03:00
parent 60445ac09e
commit 3759e1163f
228 changed files with 16106 additions and 12 deletions

View File

@@ -0,0 +1,13 @@
diff --git a/mysys/my_default.cc b/mysys/my_default.cc
--- a/mysys/my_default.cc
+++ b/mysys/my_default.cc
@@ -1180,7 +1180,7 @@ static mysql_file_getline_ret mysql_file_getline(char *buff, int size,
/* If the supplied buff/size is enough to store the line, then we return the
* buff itself. In this case, we use this noop deleter */
- static auto noop_free = [](void *) {};
+ static auto noop_free = [](void *) noexcept {};
if (is_login_file) {
if (mysql_file_ftell(file) == 0) {

View File

@@ -0,0 +1,13 @@
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake
index 192035dd..dedc59c6 100644
--- a/cmake/package_name.cmake
+++ b/cmake/package_name.cmake
@@ -94,7 +94,7 @@ MACRO(GET_PACKAGE_FILE_NAME Var)
STRING(REGEX MATCH
"ProductVersion:[\n\t ]*([0-9]+)\\.([0-9]+)" UNUSED ${SW_VERS_PRODUCTVERSION})
- IF(NOT CMAKE_MATCH_1 OR NOT CMAKE_MATCH_2)
+ IF(CMAKE_MATCH_1 STREQUAL "" OR CMAKE_MATCH_2 STREQUAL "")
MESSAGE(FATAL_ERROR "Could not run sw_vers")
ENDIF()

View File

@@ -0,0 +1,17 @@
diff --git a/sql/sql_bitmap.h b/sql/sql_bitmap.h
index a03d754..381216d 100644
--- a/sql/sql_bitmap.h
+++ b/sql/sql_bitmap.h
@@ -138,10 +138,10 @@ class Bitmap<64> {
ulonglong map;
public:
- Bitmap<64>() { init(); }
+ Bitmap() { init(); }
enum { ALL_BITS = 64 };
- explicit Bitmap<64>(uint prefix_to_set) { set_prefix(prefix_to_set); }
+ explicit Bitmap(uint prefix_to_set) { set_prefix(prefix_to_set); }
void init() { clear_all(); }
void init(uint prefix_to_set) { set_prefix(prefix_to_set); }
uint length() const { return 64; }

View File

@@ -0,0 +1,17 @@
diff --git a/sql/sql_bitmap.h b/sql/sql_bitmap.h
index 0f4a540..bd81a40 100644
--- a/sql/sql_bitmap.h
+++ b/sql/sql_bitmap.h
@@ -145,10 +145,10 @@ class Bitmap<64> {
ulonglong map;
public:
- Bitmap<64>() { init(); }
+ Bitmap() { init(); }
enum { ALL_BITS = 64 };
- explicit Bitmap<64>(uint prefix_to_set) { set_prefix(prefix_to_set); }
+ explicit Bitmap(uint prefix_to_set) { set_prefix(prefix_to_set); }
void init() { clear_all(); }
void init(uint prefix_to_set) { set_prefix(prefix_to_set); }
uint length() const { return 64; }