[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/ - gentoo-commits

From:	Michael Palimaka <kensington@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/
Date:	Fri, 02 Oct 2015 19:13:59
Message-Id:	`1443813208.2afeb25b979328971b69742c9986ad5b029d6fc4.kensington@gentoo`

1

commit:     2afeb25b979328971b69742c9986ad5b029d6fc4

2

Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>

3

AuthorDate: Fri Oct  2 19:13:28 2015 +0000

4

Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>

5

CommitDate: Fri Oct  2 19:13:28 2015 +0000

6

URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2afeb25b

7

8

kde-apps/akonadi: add patch from app-office/akonadi-server:4

9

10

Package-Manager: portage-2.2.20.1

11

12

 kde-apps/akonadi/akonadi-15.08.1.ebuild            |  2 ++

13

 kde-apps/akonadi/akonadi-15.08.49.9999.ebuild      |  2 ++

14

 kde-apps/akonadi/akonadi-9999.ebuild               |  2 ++

15

 .../files/akonadi-15.08-mysql56-crash.patch        | 23 ++++++++++++++++++++++

16

 .../files/akonadi-15.12-mysql56-crash.patch        | 23 ++++++++++++++++++++++

17

 5 files changed, 52 insertions(+)

18

19

diff --git a/kde-apps/akonadi/akonadi-15.08.1.ebuild b/kde-apps/akonadi/akonadi-15.08.1.ebuild

20

index 8d7f7a9..44204d1 100644

21

--- a/kde-apps/akonadi/akonadi-15.08.1.ebuild

22

+++ b/kde-apps/akonadi/akonadi-15.08.1.ebuild

23

@@ -36,6 +36,8 @@ RDEPEND="${CDEPEND}

24

 	!app-office/akonadi-server

25

"

26

27

+PATCHES=( "${FILESDIR}/${PN}-15.08-mysql56-crash.patch" )

28

+

29

 pkg_setup() {

30

 	# Set default storage backend in order: MySQL, SQLite PostgreSQL

31

 	# reverse driver check to keep the order

32

33

diff --git a/kde-apps/akonadi/akonadi-15.08.49.9999.ebuild b/kde-apps/akonadi/akonadi-15.08.49.9999.ebuild

34

index 718b4f0..f5a3052 100644

35

--- a/kde-apps/akonadi/akonadi-15.08.49.9999.ebuild

36

+++ b/kde-apps/akonadi/akonadi-15.08.49.9999.ebuild

37

@@ -36,6 +36,8 @@ RDEPEND="${CDEPEND}

38

 	!app-office/akonadi-server

39

"

40

41

+PATCHES=( "${FILESDIR}/${PN}-15.08-mysql56-crash.patch" )

42

+

43

 pkg_setup() {

44

 	# Set default storage backend in order: MySQL, SQLite PostgreSQL

45

 	# reverse driver check to keep the order

46

47

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild

48

index 718b4f0..2af4002 100644

49

--- a/kde-apps/akonadi/akonadi-9999.ebuild

50

+++ b/kde-apps/akonadi/akonadi-9999.ebuild

51

@@ -36,6 +36,8 @@ RDEPEND="${CDEPEND}

52

 	!app-office/akonadi-server

53

"

54

55

+PATCHES=( "${FILESDIR}/${PN}-15.12-mysql56-crash.patch" )

56

+

57

 pkg_setup() {

58

 	# Set default storage backend in order: MySQL, SQLite PostgreSQL

59

 	# reverse driver check to keep the order

60

61

diff --git a/kde-apps/akonadi/files/akonadi-15.08-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-15.08-mysql56-crash.patch

62

new file mode 100644

63

index 0000000..933b60b

64

--- /dev/null

65

+++ b/kde-apps/akonadi/files/akonadi-15.08-mysql56-crash.patch

66

@@ -0,0 +1,23 @@

67

+Gentoo-bug: 530012

68

+

69

+diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp

70

+index a18144d..68b0ecd 100644

71

+--- a/src/server/storage/dbconfigmysql.cpp

72

++++ b/src/server/storage/dbconfigmysql.cpp

73

+@@ -77,6 +77,7 @@ bool DbConfigMysql::init(QSettings &settings)

74

+                                          << QLatin1String("/usr/sbin")

75

+                                          << QLatin1String("/usr/local/sbin")

76

+                                          << QLatin1String("/usr/local/libexec")

77

++                                         << QLatin1String("/usr/share/mysql/scripts")

78

+                                          << QLatin1String("/usr/libexec")

79

+                                          << QLatin1String("/opt/mysql/libexec")

80

+                                          << QLatin1String("/opt/local/lib/mysql5/bin")

81

+@@ -280,7 +281,7 @@ void DbConfigMysql::startInternalServer()

82

+     // first run, some MySQL versions need a mysql_install_db run for that

83

+     const QString confFile = XdgBaseDirs::findResourceFile("config", QLatin1String("akonadi/mysql-global.conf"));

84

+     if (QDir(dataDir).entryList(QDir::NoDotAndDotDot | QDir::AllEntries).isEmpty() && !mMysqlInstallDbPath.isEmpty()) {

85

+-        const QStringList arguments = QStringList() << QString::fromLatin1("--force") << QString::fromLatin1("--defaults-file=%1").arg(confFile) << QString::fromLatin1("--datadir=%1/").arg(dataDir);

86

++        const QStringList arguments = QStringList() << QString::fromLatin1("--force") << QString::fromLatin1("--defaults-file=%1").arg(confFile) << QString::fromLatin1("--datadir=%1/").arg(dataDir) << QString::fromLatin1( "--basedir=/usr" ) ;

87

+         QProcess::execute(mMysqlInstallDbPath, arguments);

88

+     }

89

+

90

91

diff --git a/kde-apps/akonadi/files/akonadi-15.12-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-15.12-mysql56-crash.patch

92

new file mode 100644

93

index 0000000..d67c964

94

--- /dev/null

95

+++ b/kde-apps/akonadi/files/akonadi-15.12-mysql56-crash.patch

96

@@ -0,0 +1,23 @@

97

+Gentoo-bug: 530012

98

+

99

+diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp

100

+index 517f4bc..a7a3f38 100644

101

+--- a/src/server/storage/dbconfigmysql.cpp

102

++++ b/src/server/storage/dbconfigmysql.cpp

103

+@@ -78,6 +78,7 @@ bool DbConfigMysql::init(QSettings &settings)

104

+                                          << QStringLiteral("/usr/local/sbin")

105

+                                          << QStringLiteral("/usr/local/libexec")

106

+                                          << QStringLiteral("/usr/libexec")

107

++                                         << QStringLiteral("/usr/share/mysql/scripts")

108

+                                          << QStringLiteral("/opt/mysql/libexec")

109

+                                          << QStringLiteral("/opt/local/lib/mysql5/bin")

110

+                                          << QStringLiteral("/opt/mysql/sbin");

111

+@@ -287,7 +288,7 @@ bool DbConfigMysql::startInternalServer()

112

+     // first run, some MySQL versions need a mysql_install_db run for that

113

+     const QString confFile = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf"));

114

+     if (QDir(dataDir).entryList(QDir::NoDotAndDotDot | QDir::AllEntries).isEmpty() && !mMysqlInstallDbPath.isEmpty()) {

115

+-        const QStringList arguments = QStringList() << QStringLiteral("--force") << QStringLiteral("--defaults-file=%1").arg(confFile) << QStringLiteral("--datadir=%1/").arg(dataDir);

116

++        const QStringList arguments = QStringList() << QStringLiteral("--force") << QStringLiteral("--defaults-file=%1").arg(confFile) << QStringLiteral("--datadir=%1/").arg(dataDir) << QString::fromLatin1( "--basedir=/usr" ) ;

117

+         QProcess::execute(mMysqlInstallDbPath, arguments);

118

+     }

119

+

1	commit: 2afeb25b979328971b69742c9986ad5b029d6fc4
2	Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3	AuthorDate: Fri Oct 2 19:13:28 2015 +0000
4	Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5	CommitDate: Fri Oct 2 19:13:28 2015 +0000
6	URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2afeb25b
7
8	kde-apps/akonadi: add patch from app-office/akonadi-server:4
9
10	Package-Manager: portage-2.2.20.1
11
12	kde-apps/akonadi/akonadi-15.08.1.ebuild \| 2 ++
13	kde-apps/akonadi/akonadi-15.08.49.9999.ebuild \| 2 ++
14	kde-apps/akonadi/akonadi-9999.ebuild \| 2 ++
15	.../files/akonadi-15.08-mysql56-crash.patch \| 23 ++++++++++++++++++++++
16	.../files/akonadi-15.12-mysql56-crash.patch \| 23 ++++++++++++++++++++++
17	5 files changed, 52 insertions(+)
18
19	diff --git a/kde-apps/akonadi/akonadi-15.08.1.ebuild b/kde-apps/akonadi/akonadi-15.08.1.ebuild
20	index 8d7f7a9..44204d1 100644
21	--- a/kde-apps/akonadi/akonadi-15.08.1.ebuild
22	+++ b/kde-apps/akonadi/akonadi-15.08.1.ebuild
23	@@ -36,6 +36,8 @@ RDEPEND="${CDEPEND}
24	!app-office/akonadi-server
25	"
26
27	+PATCHES=( "${FILESDIR}/${PN}-15.08-mysql56-crash.patch" )
28	+
29	pkg_setup() {
30	# Set default storage backend in order: MySQL, SQLite PostgreSQL
31	# reverse driver check to keep the order
32
33	diff --git a/kde-apps/akonadi/akonadi-15.08.49.9999.ebuild b/kde-apps/akonadi/akonadi-15.08.49.9999.ebuild
34	index 718b4f0..f5a3052 100644
35	--- a/kde-apps/akonadi/akonadi-15.08.49.9999.ebuild
36	+++ b/kde-apps/akonadi/akonadi-15.08.49.9999.ebuild
37	@@ -36,6 +36,8 @@ RDEPEND="${CDEPEND}
38	!app-office/akonadi-server
39	"
40
41	+PATCHES=( "${FILESDIR}/${PN}-15.08-mysql56-crash.patch" )
42	+
43	pkg_setup() {
44	# Set default storage backend in order: MySQL, SQLite PostgreSQL
45	# reverse driver check to keep the order
46
47	diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
48	index 718b4f0..2af4002 100644
49	--- a/kde-apps/akonadi/akonadi-9999.ebuild
50	+++ b/kde-apps/akonadi/akonadi-9999.ebuild
51	@@ -36,6 +36,8 @@ RDEPEND="${CDEPEND}
52	!app-office/akonadi-server
53	"
54
55	+PATCHES=( "${FILESDIR}/${PN}-15.12-mysql56-crash.patch" )
56	+
57	pkg_setup() {
58	# Set default storage backend in order: MySQL, SQLite PostgreSQL
59	# reverse driver check to keep the order
60
61	diff --git a/kde-apps/akonadi/files/akonadi-15.08-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-15.08-mysql56-crash.patch
62	new file mode 100644
63	index 0000000..933b60b
64	--- /dev/null
65	+++ b/kde-apps/akonadi/files/akonadi-15.08-mysql56-crash.patch
66	@@ -0,0 +1,23 @@
67	+Gentoo-bug: 530012
68	+
69	+diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
70	+index a18144d..68b0ecd 100644
71	+--- a/src/server/storage/dbconfigmysql.cpp
72	++++ b/src/server/storage/dbconfigmysql.cpp
73	+@@ -77,6 +77,7 @@ bool DbConfigMysql::init(QSettings &settings)
74	+ << QLatin1String("/usr/sbin")
75	+ << QLatin1String("/usr/local/sbin")
76	+ << QLatin1String("/usr/local/libexec")
77	++ << QLatin1String("/usr/share/mysql/scripts")
78	+ << QLatin1String("/usr/libexec")
79	+ << QLatin1String("/opt/mysql/libexec")
80	+ << QLatin1String("/opt/local/lib/mysql5/bin")
81	+@@ -280,7 +281,7 @@ void DbConfigMysql::startInternalServer()
82	+ // first run, some MySQL versions need a mysql_install_db run for that
83	+ const QString confFile = XdgBaseDirs::findResourceFile("config", QLatin1String("akonadi/mysql-global.conf"));
84	+ if (QDir(dataDir).entryList(QDir::NoDotAndDotDot \| QDir::AllEntries).isEmpty() && !mMysqlInstallDbPath.isEmpty()) {
85	+- const QStringList arguments = QStringList() << QString::fromLatin1("--force") << QString::fromLatin1("--defaults-file=%1").arg(confFile) << QString::fromLatin1("--datadir=%1/").arg(dataDir);
86	++ const QStringList arguments = QStringList() << QString::fromLatin1("--force") << QString::fromLatin1("--defaults-file=%1").arg(confFile) << QString::fromLatin1("--datadir=%1/").arg(dataDir) << QString::fromLatin1( "--basedir=/usr" ) ;
87	+ QProcess::execute(mMysqlInstallDbPath, arguments);
88	+ }
89	+
90
91	diff --git a/kde-apps/akonadi/files/akonadi-15.12-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-15.12-mysql56-crash.patch
92	new file mode 100644
93	index 0000000..d67c964
94	--- /dev/null
95	+++ b/kde-apps/akonadi/files/akonadi-15.12-mysql56-crash.patch
96	@@ -0,0 +1,23 @@
97	+Gentoo-bug: 530012
98	+
99	+diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
100	+index 517f4bc..a7a3f38 100644
101	+--- a/src/server/storage/dbconfigmysql.cpp
102	++++ b/src/server/storage/dbconfigmysql.cpp
103	+@@ -78,6 +78,7 @@ bool DbConfigMysql::init(QSettings &settings)
104	+ << QStringLiteral("/usr/local/sbin")
105	+ << QStringLiteral("/usr/local/libexec")
106	+ << QStringLiteral("/usr/libexec")
107	++ << QStringLiteral("/usr/share/mysql/scripts")
108	+ << QStringLiteral("/opt/mysql/libexec")
109	+ << QStringLiteral("/opt/local/lib/mysql5/bin")
110	+ << QStringLiteral("/opt/mysql/sbin");
111	+@@ -287,7 +288,7 @@ bool DbConfigMysql::startInternalServer()
112	+ // first run, some MySQL versions need a mysql_install_db run for that
113	+ const QString confFile = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf"));
114	+ if (QDir(dataDir).entryList(QDir::NoDotAndDotDot \| QDir::AllEntries).isEmpty() && !mMysqlInstallDbPath.isEmpty()) {
115	+- const QStringList arguments = QStringList() << QStringLiteral("--force") << QStringLiteral("--defaults-file=%1").arg(confFile) << QStringLiteral("--datadir=%1/").arg(dataDir);
116	++ const QStringList arguments = QStringList() << QStringLiteral("--force") << QStringLiteral("--defaults-file=%1").arg(confFile) << QStringLiteral("--datadir=%1/").arg(dataDir) << QString::fromLatin1( "--basedir=/usr" ) ;
117	+ QProcess::execute(mMysqlInstallDbPath, arguments);
118	+ }
119	+

Gentoo Archives: gentoo-commits