From 00d0b2da7f045e751b188f4a160dd2db0ab2ff3e Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sun, 8 Sep 2019 10:41:51 +0200 Subject: [PATCH] qtcurve: remove qt4 support --- .../qtcurve/patches/gtkprops_constexpr.patch | 29 +++++++++++++++++++ srcpkgs/qtcurve/template | 18 +++++++----- 2 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/qtcurve/patches/gtkprops_constexpr.patch diff --git a/srcpkgs/qtcurve/patches/gtkprops_constexpr.patch b/srcpkgs/qtcurve/patches/gtkprops_constexpr.patch new file mode 100644 index 00000000000..c0e80d1e316 --- /dev/null +++ b/srcpkgs/qtcurve/patches/gtkprops_constexpr.patch @@ -0,0 +1,29 @@ +From ee2228ea2f18ac5da9b434ee6089381df815aa94 Mon Sep 17 00:00:00 2001 +From: Yichao Yu +Date: Wed, 5 Jun 2019 09:03:40 -0400 +Subject: [utils/gtkprops] Remove unnecessary constexpr, this is not allowed in + C++14 + +BUG: 408286 +--- + lib/utils/gtkprops.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +(limited to 'lib/utils/gtkprops.h') + +diff --git a/lib/utils/gtkprops.h b/lib/utils/gtkprops.h +index abc0675..e248255 100644 +--- lib/utils/gtkprops.h ++++ lib/utils/gtkprops.h +@@ -74,7 +74,7 @@ class GtkWidgetProps { + }; + #define DEF_WIDGET_SIG_CONN_PROPS(name) \ + struct _SigConn_##name##_ObjGetter { \ +- constexpr inline GObject* \ ++ inline GObject* \ + operator()(SigConn<_SigConn_##name##_ObjGetter> *p) const \ + { \ + return (GObject*)qtcContainerOf(p, Props, name)->m_w; \ +-- +cgit v1.1 + diff --git a/srcpkgs/qtcurve/template b/srcpkgs/qtcurve/template index 3ced623a5a0..ef51b46e6e3 100644 --- a/srcpkgs/qtcurve/template +++ b/srcpkgs/qtcurve/template @@ -1,16 +1,18 @@ # Template file for 'qtcurve' pkgname=qtcurve version=1.9.1 -revision=1 +revision=2 build_style=cmake -hostmakedepends="pkg-config extra-cmake-modules automoc4 perl qt-qmake" -makedepends="libxcb-devel libX11-devel qt-devel qt5-devel gtk+-devel - phonon-devel qt5-svg-devel qt5-x11extras-devel frameworkintegration-devel +configure_args="-DENABLE_QT4=OFF" +hostmakedepends="pkg-config extra-cmake-modules perl qt5-qmake qt5-host-tools + kcoreaddons gdk-pixbuf-devel" +makedepends="libxcb-devel libX11-devel qt5-devel gtk+-devel + qt5-svg-devel qt5-x11extras-devel frameworkintegration-devel ki18n-devel kdelibs4support-devel" -homepage="https://quickgit.kde.org/?p=qtcurve.git" -short_desc="A configurable set of widget styles for KDE and Gtk" +short_desc="Configurable set of widget styles for KDE and Gtk" maintainer="Helmut Pozimski " -license="LGPL-2.1" -configure_args="-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 -DQTC_QT4_ENABLE_KDE=false" +license="LGPL-2.1-or-later" +homepage="https://quickgit.kde.org/?p=qtcurve.git" distfiles="https://github.com/KDE/qtcurve/archive/${version}.tar.gz" checksum=fbfdafdac90d4c540dd55a4accfecfc3a17c1f532c5241e28003348beafaca15 +nocross="tries to execute a helper binary compiled for target on the host"