[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/, dev-qt/qtsql/files/ - gentoo-commits

From:	Andreas Sturmlechner <asturm@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/, dev-qt/qtsql/files/
Date:	Thu, 22 Feb 2018 22:19:42
Message-Id:	`1519337646.2cb8d44372ae568c49ffb65e7b7535bd982c11c9.asturm@gentoo`

1

commit:     2cb8d44372ae568c49ffb65e7b7535bd982c11c9

2

Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>

3

AuthorDate: Thu Feb 22 10:11:06 2018 +0000

4

Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>

5

CommitDate: Thu Feb 22 22:14:06 2018 +0000

6

URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=2cb8d443

7

8

dev-qt/qtsql: Extend the MariaDB define check

9

10

See also: https://mail.kde.org/pipermail/distributions/2018-February/000265.html

11

See also: https://codereview.qt-project.org/#/c/206850/

12

Package-Manager: Portage-2.3.24, Repoman-2.3.6

13

14

 dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch  | 35 ++++++++++++++++++++++

15

 ...-5.11.0_alpha.ebuild => qtsql-5.10.1-r1.ebuild} |  5 ++++

16

 dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild             |  5 ++++

17

 dev-qt/qtsql/qtsql-5.11.9999.ebuild                |  5 ++++

18

 dev-qt/qtsql/qtsql-5.9.9999.ebuild                 |  5 ++++

19

 dev-qt/qtsql/qtsql-5.9999.ebuild                   |  5 ++++

20

 6 files changed, 60 insertions(+)

21

22

diff --git a/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch b/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch

23

new file mode 100644

24

index 00000000..79de44dc

25

--- /dev/null

26

+++ b/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch

27

@@ -0,0 +1,35 @@

28

+From 64588c9bae92ef79f9ca5e87653ffb0962691d0d Mon Sep 17 00:00:00 2001

29

+From: Andy Shaw <andy.shaw@××.io>

30

+Date: Wed, 27 Sep 2017 09:23:10 +0200

31

+Subject: [PATCH] Extend the MariaDB define check to cover the later versions

32

+ too

33

+

34

+Change-Id: Ide89b4e07feb116bf152cbf3f5630d313e8ba0f1

35

+---

36

+ src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 4 ++--

37

+ 1 file changed, 2 insertions(+), 2 deletions(-)

38

+

39

+diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp

40

+index 6e428fb..b2d3e85 100644

41

+--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp

42

++++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp

43

+@@ -1159,14 +1159,14 @@ static void qLibraryInit()

44

+ # endif // MYSQL_VERSION_ID

45

+ #endif // Q_NO_MYSQL_EMBEDDED

46

+

47

+-#ifdef MARIADB_BASE_VERSION

48

++#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID)

49

+     qAddPostRoutine([]() { mysql_server_end(); });

50

+ #endif

51

+ }

52

+

53

+ static void qLibraryEnd()

54

+ {

55

+-#if !defined(MARIADB_BASE_VERSION)

56

++#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)

57

+ # if !defined(Q_NO_MYSQL_EMBEDDED)

58

+ #  if MYSQL_VERSION_ID > 40000

59

+ #   if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003

60

+--

61

+2.7.4

62

+

63

64

diff --git a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild b/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild

65

similarity index 92%

66

copy from dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild

67

copy to dev-qt/qtsql/qtsql-5.10.1-r1.ebuild

68

index 8b17279a..7765a7bb 100644

69

--- a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild

70

+++ b/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild

71

@@ -28,6 +28,11 @@ DEPEND="

72

"

73

 RDEPEND="${DEPEND}"

74

75

+PATCHES=(

76

+	"${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"

77

+	# See also: https://codereview.qt-project.org/#/c/206850/

78

+)

79

+

80

 QT5_TARGET_SUBDIRS=(

81

 	src/sql

82

 	src/plugins/sqldrivers

83

84

diff --git a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild b/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild

85

index 8b17279a..7765a7bb 100644

86

--- a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild

87

+++ b/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild

88

@@ -28,6 +28,11 @@ DEPEND="

89

"

90

 RDEPEND="${DEPEND}"

91

92

+PATCHES=(

93

+	"${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"

94

+	# See also: https://codereview.qt-project.org/#/c/206850/

95

+)

96

+

97

 QT5_TARGET_SUBDIRS=(

98

 	src/sql

99

 	src/plugins/sqldrivers

100

101

diff --git a/dev-qt/qtsql/qtsql-5.11.9999.ebuild b/dev-qt/qtsql/qtsql-5.11.9999.ebuild

102

index 8b17279a..7765a7bb 100644

103

--- a/dev-qt/qtsql/qtsql-5.11.9999.ebuild

104

+++ b/dev-qt/qtsql/qtsql-5.11.9999.ebuild

105

@@ -28,6 +28,11 @@ DEPEND="

106

"

107

 RDEPEND="${DEPEND}"

108

109

+PATCHES=(

110

+	"${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"

111

+	# See also: https://codereview.qt-project.org/#/c/206850/

112

+)

113

+

114

 QT5_TARGET_SUBDIRS=(

115

 	src/sql

116

 	src/plugins/sqldrivers

117

118

diff --git a/dev-qt/qtsql/qtsql-5.9.9999.ebuild b/dev-qt/qtsql/qtsql-5.9.9999.ebuild

119

index 8b17279a..7765a7bb 100644

120

--- a/dev-qt/qtsql/qtsql-5.9.9999.ebuild

121

+++ b/dev-qt/qtsql/qtsql-5.9.9999.ebuild

122

@@ -28,6 +28,11 @@ DEPEND="

123

"

124

 RDEPEND="${DEPEND}"

125

126

+PATCHES=(

127

+	"${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"

128

+	# See also: https://codereview.qt-project.org/#/c/206850/

129

+)

130

+

131

 QT5_TARGET_SUBDIRS=(

132

 	src/sql

133

 	src/plugins/sqldrivers

134

135

diff --git a/dev-qt/qtsql/qtsql-5.9999.ebuild b/dev-qt/qtsql/qtsql-5.9999.ebuild

136

index 8b17279a..7765a7bb 100644

137

--- a/dev-qt/qtsql/qtsql-5.9999.ebuild

138

+++ b/dev-qt/qtsql/qtsql-5.9999.ebuild

139

@@ -28,6 +28,11 @@ DEPEND="

140

"

141

 RDEPEND="${DEPEND}"

142

143

+PATCHES=(

144

+	"${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"

145

+	# See also: https://codereview.qt-project.org/#/c/206850/

146

+)

147

+

148

 QT5_TARGET_SUBDIRS=(

149

 	src/sql

150

 	src/plugins/sqldrivers

1	commit: 2cb8d44372ae568c49ffb65e7b7535bd982c11c9
2	Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3	AuthorDate: Thu Feb 22 10:11:06 2018 +0000
4	Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5	CommitDate: Thu Feb 22 22:14:06 2018 +0000
6	URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2cb8d443
7
8	dev-qt/qtsql: Extend the MariaDB define check
9
10	See also: https://mail.kde.org/pipermail/distributions/2018-February/000265.html
11	See also: https://codereview.qt-project.org/#/c/206850/
12	Package-Manager: Portage-2.3.24, Repoman-2.3.6
13
14	dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch \| 35 ++++++++++++++++++++++
15	...-5.11.0_alpha.ebuild => qtsql-5.10.1-r1.ebuild} \| 5 ++++
16	dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild \| 5 ++++
17	dev-qt/qtsql/qtsql-5.11.9999.ebuild \| 5 ++++
18	dev-qt/qtsql/qtsql-5.9.9999.ebuild \| 5 ++++
19	dev-qt/qtsql/qtsql-5.9999.ebuild \| 5 ++++
20	6 files changed, 60 insertions(+)
21
22	diff --git a/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch b/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch
23	new file mode 100644
24	index 00000000..79de44dc
25	--- /dev/null
26	+++ b/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch
27	@@ -0,0 +1,35 @@
28	+From 64588c9bae92ef79f9ca5e87653ffb0962691d0d Mon Sep 17 00:00:00 2001
29	+From: Andy Shaw <andy.shaw@××.io>
30	+Date: Wed, 27 Sep 2017 09:23:10 +0200
31	+Subject: [PATCH] Extend the MariaDB define check to cover the later versions
32	+ too
33	+
34	+Change-Id: Ide89b4e07feb116bf152cbf3f5630d313e8ba0f1
35	+---
36	+ src/plugins/sqldrivers/mysql/qsql_mysql.cpp \| 4 ++--
37	+ 1 file changed, 2 insertions(+), 2 deletions(-)
38	+
39	+diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
40	+index 6e428fb..b2d3e85 100644
41	+--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
42	++++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
43	+@@ -1159,14 +1159,14 @@ static void qLibraryInit()
44	+ # endif // MYSQL_VERSION_ID
45	+ #endif // Q_NO_MYSQL_EMBEDDED
46	+
47	+-#ifdef MARIADB_BASE_VERSION
48	++#if defined(MARIADB_BASE_VERSION) \|\| defined(MARIADB_VERSION_ID)
49	+ qAddPostRoutine([]() { mysql_server_end(); });
50	+ #endif
51	+ }
52	+
53	+ static void qLibraryEnd()
54	+ {
55	+-#if !defined(MARIADB_BASE_VERSION)
56	++#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
57	+ # if !defined(Q_NO_MYSQL_EMBEDDED)
58	+ # if MYSQL_VERSION_ID > 40000
59	+ # if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) \|\| MYSQL_VERSION_ID >= 50003
60	+--
61	+2.7.4
62	+
63
64	diff --git a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild b/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
65	similarity index 92%
66	copy from dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
67	copy to dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
68	index 8b17279a..7765a7bb 100644
69	--- a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
70	+++ b/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
71	@@ -28,6 +28,11 @@ DEPEND="
72	"
73	RDEPEND="${DEPEND}"
74
75	+PATCHES=(
76	+ "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
77	+ # See also: https://codereview.qt-project.org/#/c/206850/
78	+)
79	+
80	QT5_TARGET_SUBDIRS=(
81	src/sql
82	src/plugins/sqldrivers
83
84	diff --git a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild b/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
85	index 8b17279a..7765a7bb 100644
86	--- a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
87	+++ b/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
88	@@ -28,6 +28,11 @@ DEPEND="
89	"
90	RDEPEND="${DEPEND}"
91
92	+PATCHES=(
93	+ "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
94	+ # See also: https://codereview.qt-project.org/#/c/206850/
95	+)
96	+
97	QT5_TARGET_SUBDIRS=(
98	src/sql
99	src/plugins/sqldrivers
100
101	diff --git a/dev-qt/qtsql/qtsql-5.11.9999.ebuild b/dev-qt/qtsql/qtsql-5.11.9999.ebuild
102	index 8b17279a..7765a7bb 100644
103	--- a/dev-qt/qtsql/qtsql-5.11.9999.ebuild
104	+++ b/dev-qt/qtsql/qtsql-5.11.9999.ebuild
105	@@ -28,6 +28,11 @@ DEPEND="
106	"
107	RDEPEND="${DEPEND}"
108
109	+PATCHES=(
110	+ "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
111	+ # See also: https://codereview.qt-project.org/#/c/206850/
112	+)
113	+
114	QT5_TARGET_SUBDIRS=(
115	src/sql
116	src/plugins/sqldrivers
117
118	diff --git a/dev-qt/qtsql/qtsql-5.9.9999.ebuild b/dev-qt/qtsql/qtsql-5.9.9999.ebuild
119	index 8b17279a..7765a7bb 100644
120	--- a/dev-qt/qtsql/qtsql-5.9.9999.ebuild
121	+++ b/dev-qt/qtsql/qtsql-5.9.9999.ebuild
122	@@ -28,6 +28,11 @@ DEPEND="
123	"
124	RDEPEND="${DEPEND}"
125
126	+PATCHES=(
127	+ "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
128	+ # See also: https://codereview.qt-project.org/#/c/206850/
129	+)
130	+
131	QT5_TARGET_SUBDIRS=(
132	src/sql
133	src/plugins/sqldrivers
134
135	diff --git a/dev-qt/qtsql/qtsql-5.9999.ebuild b/dev-qt/qtsql/qtsql-5.9999.ebuild
136	index 8b17279a..7765a7bb 100644
137	--- a/dev-qt/qtsql/qtsql-5.9999.ebuild
138	+++ b/dev-qt/qtsql/qtsql-5.9999.ebuild
139	@@ -28,6 +28,11 @@ DEPEND="
140	"
141	RDEPEND="${DEPEND}"
142
143	+PATCHES=(
144	+ "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
145	+ # See also: https://codereview.qt-project.org/#/c/206850/
146	+)
147	+
148	QT5_TARGET_SUBDIRS=(
149	src/sql
150	src/plugins/sqldrivers

Gentoo Archives: gentoo-commits