summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-themes/qtcurve/files')
-rw-r--r--x11-themes/qtcurve/files/qtcurve-1.8.18-gtk2_segfault.patch14
-rw-r--r--x11-themes/qtcurve/files/qtcurve-1.8.18-remove_qt_filedialog_api.patch58
2 files changed, 72 insertions, 0 deletions
diff --git a/x11-themes/qtcurve/files/qtcurve-1.8.18-gtk2_segfault.patch b/x11-themes/qtcurve/files/qtcurve-1.8.18-gtk2_segfault.patch
new file mode 100644
index 000000000000..b4a2f1a44610
--- /dev/null
+++ b/x11-themes/qtcurve/files/qtcurve-1.8.18-gtk2_segfault.patch
@@ -0,0 +1,14 @@
+https://github.com/QtCurve/qtcurve-gtk2/issues/3
+https://gist.github.com/anonymous/8e6e4ea32dabf03cf630
+
+--- qtcurve-1.8.18/gtk2/style/qtcurve.c
++++ qtcurve-1.8.18/gtk2/style/qtcurve.c
+@@ -372,7 +372,7 @@
+ } else if (!(qtSettings.app == GTK_APP_JAVA && widget &&
+ GTK_IS_LABEL(widget))) {
+ if (state != GTK_STATE_PRELIGHT || opts.crHighlight ||
+- strcmp(detail, "checkbutton") != 0) {
++ ( detail != NULL && strcmp(detail, "checkbutton") != 0 )) {
+ parent_class->draw_flat_box(style, window, state, shadow, area,
+ widget, detail, x, y, width, height);
+ }
diff --git a/x11-themes/qtcurve/files/qtcurve-1.8.18-remove_qt_filedialog_api.patch b/x11-themes/qtcurve/files/qtcurve-1.8.18-remove_qt_filedialog_api.patch
new file mode 100644
index 000000000000..087ec7f27f67
--- /dev/null
+++ b/x11-themes/qtcurve/files/qtcurve-1.8.18-remove_qt_filedialog_api.patch
@@ -0,0 +1,58 @@
+From 323402d8b99502300f65e909c61153cbd5d5d997 Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Mon, 19 May 2014 10:37:37 +0200
+Subject: [PATCH] remove qt_filedialog_* api
+
+it has been removed and doesn't build anymore with recent Qt5 stable
+branch
+---
+ qt5/style/qtcurve_api.cpp | 26 --------------------------
+ 1 file changed, 26 deletions(-)
+
+diff --git a/qt5/style/qtcurve_api.cpp b/qt5/style/qtcurve_api.cpp
+index a5ded22..2c794b7 100644
+--- a/qt5/style/qtcurve_api.cpp
++++ b/qt5/style/qtcurve_api.cpp
+@@ -67,25 +67,6 @@
+
+ #include <QDebug>
+
+-extern QString (*qt_filedialog_existing_directory_hook)(
+- QWidget *parent, const QString &caption, const QString &dir,
+- QFileDialog::Options options);
+-
+-extern QString (*qt_filedialog_open_filename_hook)(
+- QWidget *parent, const QString &caption, const QString &dir,
+- const QString &filter, QString *selectedFilter,
+- QFileDialog::Options options);
+-
+-extern QStringList (*qt_filedialog_open_filenames_hook)(
+- QWidget * parent, const QString &caption, const QString &dir,
+- const QString &filter, QString *selectedFilter,
+- QFileDialog::Options options);
+-
+-extern QString (*qt_filedialog_save_filename_hook)(
+- QWidget *parent, const QString &caption, const QString &dir,
+- const QString &filter, QString *selectedFilter,
+- QFileDialog::Options options);
+-
+ namespace QtCurve {
+
+ void
+@@ -163,13 +144,6 @@ Style::polish(QApplication *app)
+ opts.menuBgndAppearance = APPEARANCE_FLAT;
+ }
+
+- if (opts.useQtFileDialogApps.contains(appName)) {
+- qt_filedialog_existing_directory_hook = 0L;
+- qt_filedialog_open_filename_hook = 0L;
+- qt_filedialog_open_filenames_hook = 0L;
+- qt_filedialog_save_filename_hook = 0L;
+- }
+-
+ QCommonStyle::polish(app);
+ if (opts.hideShortcutUnderline) {
+ app->installEventFilter(m_shortcutHandler);
+--
+1.9.3
+