-
-
Notifications
You must be signed in to change notification settings - Fork 0
/
libreoffice-7.6-dont-prefer-gtk-over-qt.patch
143 lines (140 loc) · 2.91 KB
/
libreoffice-7.6-dont-prefer-gtk-over-qt.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
diff -up libreoffice-24.8.0.2/vcl/source/app/salplug.cxx.7~ libreoffice-24.8.0.2/vcl/source/app/salplug.cxx
--- libreoffice-24.8.0.2/vcl/source/app/salplug.cxx.7~ 2024-07-26 15:49:08.000000000 +0200
+++ libreoffice-24.8.0.2/vcl/source/app/salplug.cxx 2024-08-06 01:30:55.924275966 +0200
@@ -184,6 +184,15 @@ const char* const* autodetect_plugin_lis
#if ENABLE_KF5
"kf5",
#endif
+#if ENABLE_QT5
+ "qt5",
+#endif
+#if ENABLE_KF6
+ "kf6",
+#endif
+#if ENABLE_QT6
+ "qt6",
+#endif
#if ENABLE_GTK3_KDE5
"gtk3_kde5",
#endif
@@ -201,9 +210,15 @@ const char* const* autodetect_plugin_lis
#if ENABLE_KF6
"kf6",
#endif
+#if ENABLE_QT6
+ "qt6",
+#endif
#if ENABLE_KF5
"kf5",
#endif
+#if ENABLE_QT5
+ "qt5",
+#endif
#if ENABLE_GTK3_KDE5
"gtk3_kde5",
#endif
@@ -218,6 +233,21 @@ const char* const* autodetect_plugin_lis
static const char* const pStandardFallbackList[] =
{
+#if ENABLE_QT6
+ "qt6",
+#endif
+#if ENABLE_KF6
+ "kf6",
+#endif
+#if ENABLE_QT5
+ "qt5",
+#endif
+#if ENABLE_KF5
+ "kf5",
+#endif
+#if ENABLE_GTK3_KDE5
+ "gtk3_kde5",
+#endif
#if ENABLE_GTK3
"gtk3",
#endif
@@ -227,6 +257,32 @@ const char* const* autodetect_plugin_lis
nullptr
};
+ static const char* const pGtkFallbackList[] =
+ {
+#if ENABLE_GTK3
+ "gtk3",
+#endif
+#if ENABLE_GTK3_KDE5
+ "gtk3_kde5",
+#endif
+#if ENABLE_QT6
+ "qt6",
+#endif
+#if ENABLE_KF6
+ "kf6",
+#endif
+#if ENABLE_QT5
+ "qt5",
+#endif
+#if ENABLE_KF5
+ "kf5",
+#endif
+#if ENABLE_GEN
+ "gen",
+#endif
+ nullptr
+ };
+
#if ENABLE_HEADLESS
static const char* const pHeadlessFallbackList[] =
{
@@ -248,10 +304,10 @@ const char* const* autodetect_plugin_lis
desktop == DESKTOP_UNITY ||
desktop == DESKTOP_XFCE ||
desktop == DESKTOP_MATE )
- pList = pStandardFallbackList;
- else if (desktop == DESKTOP_PLASMA5 || desktop == DESKTOP_LXQT)
+ pList = pGtkFallbackList;
+ else if (desktop == DESKTOP_PLASMA5)
pList = pKDEFallbackList;
- else if (desktop == DESKTOP_PLASMA6)
+ else if (desktop == DESKTOP_PLASMA6 || desktop == DESKTOP_LXQT)
pList = pPlasma6FallbackList;
return pList;
@@ -325,27 +381,27 @@ SalInstance *CreateSalInstance()
#elif defined(MACOSX)
"osx",
#else // !_WIN32 && !MACOSX
-#if ENABLE_GTK3
- "gtk3",
+#if ENABLE_KF6
+ "kf6",
+#endif
+#if ENABLE_QT6
+ "qt6",
#endif
#if ENABLE_KF5
"kf5",
#endif
+#if ENABLE_QT5
+ "qt5",
+#endif
#if ENABLE_GTK3_KDE5
"gtk3_kde5",
#endif
+#if ENABLE_GTK3
+ "gtk3",
+#endif
#if ENABLE_GEN
"gen",
#endif
-#if ENABLE_QT5
- "qt5",
-#endif
-#if ENABLE_KF6
- "kf6",
-#endif
-#if ENABLE_QT6
- "qt6",
-#endif
#endif // !_WIN32 && !MACOSX
nullptr
};