Hello community, here is the log from the commit of package qtcurve-kde4 for openSUSE:Factory checked in at 2014-05-06 14:02:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qtcurve-kde4 (Old) and /work/SRC/openSUSE:Factory/.qtcurve-kde4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qtcurve-kde4" Changes: -------- --- /work/SRC/openSUSE:Factory/qtcurve-kde4/qtcurve-kde4.changes 2014-02-02 17:39:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qtcurve-kde4.new/qtcurve-kde4.changes 2014-05-06 14:02:38.000000000 +0200 @@ -1,0 +2,11 @@ +Mon May 5 17:21:14 UTC 2014 - [email protected] + +- Build Qt5 style for 13.1 and newer: + * Create qtcurve-qt5 subpackage + * Added omit_deprecated_apis.patch, removes usage of filehooks API + removed with Qt 5.3 + * Added BuildRequires: pkgconfig(Qt5Core), pkgconfig(Qt5Gui), + pkgconfig(Qt5Widgets), pkgconfig(Qt5Svg), pkgconfig(Qt5DBus), + pkgconfig(Qt5X11Extras) and libQt5Widgets-private-headers-devel + +------------------------------------------------------------------- New: ---- omit_deprecated_apis.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-kde4.spec ++++++ --- /var/tmp/diff_new_pack.kbbMQe/_old 2014-05-06 14:02:39.000000000 +0200 +++ /var/tmp/diff_new_pack.kbbMQe/_new 2014-05-06 14:02:39.000000000 +0200 @@ -24,10 +24,26 @@ Group: System/GUI/KDE Url: https://github.com/QtCurve/qtcurve Source0: qtcurve-%{version}.tar.gz +# PATCH-FIX-UPSTREAM omit_deprecated_apis.patch -- filedialog hooks are removed from Qt 5.3 +Patch0: omit_deprecated_apis.patch BuildRequires: gtk2-devel BuildRequires: kdebase4-workspace-devel BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(xcb) +%if %suse_version > 1230 +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5X11Extras) +%if %suse_version > 1310 +BuildRequires: libQt5Widgets-private-headers-devel +%else +BuildRequires: libqt5-qtbase-private-headers-devel +%endif +%endif Requires: libqtcurve-utils1 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -63,12 +79,26 @@ This package contains the QtCurve engine for GTK+ 2. QtCurve is a set of widget styles available for Qt and GTK+. +%if %suse_version > 1230 +%package -n qtcurve-qt5 +Summary: QtCurve style for Qt 5 +Group: System/GUI/KDE + +%description -n qtcurve-qt5 +This package contains the QtCurve style for Qt 5. QtCurve is a set +of widget styles available for Qt and GTK+. +%endif + %prep %setup -q -n qtcurve-%{version} +%patch0 -p1 %build -# Don't build Qt5 deco/style yet +%if %suse_version > 1230 + %cmake_kde4 -d build -- -DENABLE_QT5=ON -DENABLE_GTK2=ON +%else %cmake_kde4 -d build -- -DENABLE_QT5=OFF -DENABLE_GTK2=ON +%endif %make_jobs %install @@ -121,4 +151,11 @@ %{_kde4_libdir}/gtk-2.0/*/engines/libqtcurve.* %{_kde4_datadir}/themes/QtCurve/ +%if %suse_version > 1230 +%files -n qtcurve-qt5 +%defattr(-,root,root) +%doc ChangeLog.md COPYING README.md TODO.md +%{_libqt5_plugindir}/ +%endif + %changelog ++++++ omit_deprecated_apis.patch ++++++ --- qtcurve-1.8.18.orig/qt5/style/qtcurve_api.cpp 2014-01-25 21:13:54.000000000 +0100 +++ qtcurve-1.8.18/qt5/style/qtcurve_api.cpp 2014-05-05 19:13:12.045008210 +0200 @@ -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); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
