From 0fc709fd141f14c01e9933d7693ac16d6744c8de Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 16 Apr 2020 10:55:08 +0100 Subject: lxqt-base/lxqt-config : fix building against qt 5.14 --- .../files/lxqt-config-0.14.1-qt-5.14-build.patch | 21 ++++++ lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild | 85 ++++++++++++++++++++++ lxqt-base/lxqt-config/lxqt-config-0.14.1.ebuild | 83 --------------------- 3 files changed, 106 insertions(+), 83 deletions(-) create mode 100644 lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch create mode 100644 lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild delete mode 100644 lxqt-base/lxqt-config/lxqt-config-0.14.1.ebuild diff --git a/lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch b/lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch new file mode 100644 index 00000000..31b22cd6 --- /dev/null +++ b/lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch @@ -0,0 +1,21 @@ +From cd7de12f2ebe5a2ad03c2086da4c3b5317a4506e Mon Sep 17 00:00:00 2001 +From: Chih-Hsuan Yen +Date: Sun, 15 Dec 2019 09:32:55 +0800 +Subject: [PATCH] Fix building with Qt 5.14 + +--- + lxqt-config-input/touchpaddevice.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lxqt-config-input/touchpaddevice.cpp b/lxqt-config-input/touchpaddevice.cpp +index 31adbe5f..41690c2c 100644 +--- a/lxqt-config-input/touchpaddevice.cpp ++++ b/lxqt-config-input/touchpaddevice.cpp +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild new file mode 100644 index 00000000..693697f0 --- /dev/null +++ b/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils xdg-utils + +DESCRIPTION="LXQt system configuration control center" +HOMEPAGE="https://lxqt.org/" + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" +else + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2" +SLOT="0" +IUSE="+gtk +monitor +touchpad" + +BDEPEND=" + dev-qt/linguist-tools:5 + >=lxqt-base/lxqt-build-tools-0.6.0 +" +DEPEND=" + >=dev-libs/libqtxdg-3.3.1 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + kde-frameworks/kwindowsystem:5 + =lxqt-base/liblxqt-$(ver_cut 1-2)* + sys-libs/zlib:= + x11-apps/setxkbmap + x11-libs/libxcb:= + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXfixes + monitor? ( kde-plasma/libkscreen:5= ) + touchpad? ( + virtual/libudev + x11-drivers/xf86-input-libinput + x11-libs/libXext + ) +" +RDEPEND="${DEPEND} + !lxqt-base/lxqt-l10n +" + +PATCHES=( ${FILESDIR}/${P}-qt-5.14-build.patch ) + +src_prepare() { + if use gtk; then + # Redcore Linux patch : hide no longer working appearance settings when using qgtk2 platform plugin + eapply "${FILESDIR}"/"${PN}"-hide-unwanted-appearance-settings.patch + cmake-utils_src_prepare + else + cmake-utils_src_prepare + fi +} + +src_configure() { + local mycmakeargs=( + -DWITH_MONITOR="$(usex monitor)" + -DWITH_TOUCHPAD="$(usex touchpad)" + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + doman man/*.1 liblxqt-config-cursor/man/*.1 lxqt-config-appearance/man/*.1 +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/lxqt-base/lxqt-config/lxqt-config-0.14.1.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.14.1.ebuild deleted file mode 100644 index 6789b6d6..00000000 --- a/lxqt-base/lxqt-config/lxqt-config-0.14.1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils xdg-utils - -DESCRIPTION="LXQt system configuration control center" -HOMEPAGE="https://lxqt.org/" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" -else - SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2" -SLOT="0" -IUSE="+gtk +monitor +touchpad" - -BDEPEND=" - dev-qt/linguist-tools:5 - >=lxqt-base/lxqt-build-tools-0.6.0 -" -DEPEND=" - >=dev-libs/libqtxdg-3.3.1 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - kde-frameworks/kwindowsystem:5 - =lxqt-base/liblxqt-$(ver_cut 1-2)* - sys-libs/zlib:= - x11-apps/setxkbmap - x11-libs/libxcb:= - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXfixes - monitor? ( kde-plasma/libkscreen:5= ) - touchpad? ( - virtual/libudev - x11-drivers/xf86-input-libinput - x11-libs/libXext - ) -" -RDEPEND="${DEPEND} - !lxqt-base/lxqt-l10n -" - -src_prepare() { - if use gtk; then - # Redcore Linux patch : hide no longer working appearance settings when using qgtk2 platform plugin - eapply "${FILESDIR}"/"${PN}"-hide-unwanted-appearance-settings.patch - cmake-utils_src_prepare - else - cmake-utils_src_prepare - fi -} - -src_configure() { - local mycmakeargs=( - -DWITH_MONITOR="$(usex monitor)" - -DWITH_TOUCHPAD="$(usex touchpad)" - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - doman man/*.1 liblxqt-config-cursor/man/*.1 lxqt-config-appearance/man/*.1 -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} -- cgit v1.2.3