aboutsummaryrefslogtreecommitdiffstats
path: root/debian/patches/gtk2-platformtheme-compat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/gtk2-platformtheme-compat.patch')
-rw-r--r--debian/patches/gtk2-platformtheme-compat.patch35
1 files changed, 18 insertions, 17 deletions
diff --git a/debian/patches/gtk2-platformtheme-compat.patch b/debian/patches/gtk2-platformtheme-compat.patch
index 30a5985..00febc1 100644
--- a/debian/patches/gtk2-platformtheme-compat.patch
+++ b/debian/patches/gtk2-platformtheme-compat.patch
@@ -4,22 +4,22 @@ Origin: vendor
Forwarded: not-needed
---
- src/qt5gtk2-qtplugin/main.cpp | 2 +-
+ src/qt5gtk2-qtplugin/main.cpp | 3 ++-
src/qt5gtk2-qtplugin/qt5gtk2.json | 2 +-
src/qt5gtk2-style/plugin.cpp | 2 +-
src/qt5gtk2-style/qt5gtk2.json | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
+ 4 files changed, 5 insertions(+), 4 deletions(-)
---- a/src/qt5gtk2-qtplugin/qt5gtk2.json 2023-01-09 23:24:08.923845343 -0500
-+++ b/src/qt5gtk2-qtplugin/qt5gtk2.json 2023-01-09 23:24:08.911845273 -0500
+--- a/src/qt5gtk2-qtplugin/qt5gtk2.json
++++ b/src/qt5gtk2-qtplugin/qt5gtk2.json
@@ -1,3 +1,3 @@
{
-- "Keys": [ "qt5gtk2" ]
-+ "Keys": [ "gtk2", "qt5gtk2" ]
+- "Keys": [ "qt5gtk2", "qt6gtk2" ]
++ "Keys": [ "gtk2", "qt5gtk2", "qt6gtk2" ]
}
---- a/src/qt5gtk2-style/plugin.cpp 2023-01-09 23:24:08.923845343 -0500
-+++ b/src/qt5gtk2-style/plugin.cpp 2023-01-09 23:24:08.911845273 -0500
-@@ -34,7 +34,7 @@
+--- a/src/qt5gtk2-style/plugin.cpp
++++ b/src/qt5gtk2-style/plugin.cpp
+@@ -34,7 +34,7 @@ public:
QStyle *Qt5Gtk2StylePlugin::create(const QString &key)
{
@@ -28,21 +28,22 @@ Forwarded: not-needed
return new QGtkStyle;
return 0;
}
---- a/src/qt5gtk2-style/qt5gtk2.json 2023-01-09 23:24:08.923845343 -0500
-+++ b/src/qt5gtk2-style/qt5gtk2.json 2023-01-09 23:24:08.911845273 -0500
+--- a/src/qt5gtk2-style/qt5gtk2.json
++++ b/src/qt5gtk2-style/qt5gtk2.json
@@ -1,3 +1,3 @@
{
- "Keys": [ "qt5gtk2" ]
+ "Keys": [ "gtk2", "qt5gtk2" ]
}
---- a/src/qt5gtk2-qtplugin/main.cpp 2022-06-04 02:58:43.000000000 -0400
-+++ b/src/qt5gtk2-qtplugin/main.cpp 2023-01-09 23:25:17.736251794 -0500
-@@ -35,7 +35,7 @@
- QPlatformTheme *Qt5Gtk2ThemePlugin::create(const QString &key, const QStringList &params)
+--- a/src/qt5gtk2-qtplugin/main.cpp
++++ b/src/qt5gtk2-qtplugin/main.cpp
+@@ -36,7 +36,8 @@ QPlatformTheme *Qt5Gtk2ThemePlugin::crea
{
Q_UNUSED(params);
-- if (!key.compare(QLatin1String(Qt5Gtk2Theme::name), Qt::CaseInsensitive))
-+ if (key.toLower() == QStringLiteral("gtk2") || key.toLower() == QStringLiteral("qt5gtk2"))
+ if (!key.compare(QLatin1String(Qt5Gtk2Theme::name), Qt::CaseInsensitive) ||
+- !key.compare(QLatin1String("qt6gtk2"), Qt::CaseInsensitive))
++ !key.compare(QLatin1String("qt6gtk2"), Qt::CaseInsensitive) ||
++ !key.compare(QLatin1String("gtk2"), Qt::CaseInsensitive))
return new Qt5Gtk2Theme;
return 0;