diff options
-rw-r--r-- | metadata/categories.conf | 1 | ||||
-rw-r--r-- | packages/x11-themes/qtcurve/files/qtcurve-1.8.18-remove-qt_filedialog_-api.patch | 60 | ||||
-rw-r--r-- | packages/x11-themes/qtcurve/qtcurve-scm.exheres-0 | 70 |
3 files changed, 131 insertions, 0 deletions
diff --git a/metadata/categories.conf b/metadata/categories.conf index 7885c9f..0ce3cad 100644 --- a/metadata/categories.conf +++ b/metadata/categories.conf @@ -1,3 +1,4 @@ net-libs net-im net-p2p +x11-themes diff --git a/packages/x11-themes/qtcurve/files/qtcurve-1.8.18-remove-qt_filedialog_-api.patch b/packages/x11-themes/qtcurve/files/qtcurve-1.8.18-remove-qt_filedialog_-api.patch new file mode 100644 index 0000000..22b5629 --- /dev/null +++ b/packages/x11-themes/qtcurve/files/qtcurve-1.8.18-remove-qt_filedialog_-api.patch @@ -0,0 +1,60 @@ +Upstream: yes + +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); +-- +2.4.5 + diff --git a/packages/x11-themes/qtcurve/qtcurve-scm.exheres-0 b/packages/x11-themes/qtcurve/qtcurve-scm.exheres-0 new file mode 100644 index 0000000..3442894 --- /dev/null +++ b/packages/x11-themes/qtcurve/qtcurve-scm.exheres-0 @@ -0,0 +1,70 @@ +# Copyright 2014 David Heidelberger <david.heidelberger@ixit.cz> +# Distributed under the terms of the GNU General Public License v2 + +SCM_REPOSITORY="git://anongit.kde.org/qtcurve" +DOWNLOADS="" +PLATFORMS="~amd64" +require scm-git + +require cmake [ api=2 ] + +SUMMARY="QtCurve - Qt5/Qt4/GTK+2 widget styles" +DESCRIPTION="This is a set of widget styles for Qt5/Qt4 and Gtk2 based apps." + +LICENCES="LGPL-2.1" +SLOT="0" +MYOPTIONS=" + gtk2 [[ requires = X ]] + qt4 [[ requires = X ]] + qt5 + X +" + +DEPENDENCIES=" + build: + sys-devel/gettext + gtk2? ( + virtual/pkg-config + ) + X? ( + virtual/pkg-config + x11-proto/xcb-proto + ) + build+run: + x11-libs/libxcb + kde-frameworks/frameworkintegration + kde-frameworks/kdelibs4support + gtk2? ( + x11-libs/gtk+:2 + ) + qt4? ( + x11-libs/qt:4 + ) + qt5? ( + x11-libs/qtbase:5 + x11-libs/qtsvg:5 + x11-libs/qtx11extras:5 + ) + X? ( + x11-libs/libX11 + ) +" +CMAKE_SRC_CONFIGURE_PARAMS+=( + -DQTC_LOCALE_DIR:PATH=/usr/share/locale + # We don't ship kde-workspace:4 anymore + -DQTC_QT4_ENABLE_KDE:BOOL=FALSE + # Disabled by default upstream + -DQTC_QT5_ENABLE_QTQUICK2:BOOL=FALSE +) +CMAKE_SRC_CONFIGURE_OPTIONS+=( + 'X QTC_ENABLE_X11' +) +CMAKE_SRC_CONFIGURE_OPTION_ENABLES+=( + GTK2 + QT4 + QT5 +) +CMAKE_SRC_CONFIGURE_TESTS+=( '-DENABLE_TEST:BOOL=TRUE -DENABLE_TEST:BOOL=FALSE' ) + + + |