From 0532371e8675437fc2f466b79cd03c81305d089f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 18 Apr 2023 09:03:47 +0100 Subject: lxqt-base/lxqt-config : version bump --- lxqt-base/lxqt-config/Manifest | 2 +- .../files/lxqt-config-kscreen-52690.patch | 80 ---------------------- lxqt-base/lxqt-config/lxqt-config-1.2.0-r3.ebuild | 80 ---------------------- lxqt-base/lxqt-config/lxqt-config-1.3.0-r1.ebuild | 78 +++++++++++++++++++++ 4 files changed, 79 insertions(+), 161 deletions(-) delete mode 100644 lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch delete mode 100644 lxqt-base/lxqt-config/lxqt-config-1.2.0-r3.ebuild create mode 100644 lxqt-base/lxqt-config/lxqt-config-1.3.0-r1.ebuild (limited to 'lxqt-base') diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest index 49f27324..bb8582dd 100644 --- a/lxqt-base/lxqt-config/Manifest +++ b/lxqt-base/lxqt-config/Manifest @@ -1 +1 @@ -DIST lxqt-config-1.2.0.tar.xz 364972 BLAKE2B 2c4082f8b70284492d02372e03088dbade48a8288cd2e0038dd60fd4a70c4ff434188d795ec75bbd268ea3d75661751230c06a74f1cd65273934f89604c7170d SHA512 ae0f71a6ac85e80bc1d1de890148b908bda21aced0829f5f203442f3a0139dbeec44e7190adc1f5706361f4cf7a00bdead3035c63bf6da2bbba5a16a88d7b469 +DIST lxqt-config-1.3.0.tar.xz 370624 BLAKE2B 2015d2ec8f1a925e505b8c93b3db99fe351d8db742c78b2a19e8f8be7df47be619b3b5c313a693f1ac4e54b1f117aea5a706e8eae2d0fb6340fafe1b4a47412d SHA512 30610d1c90d897eb54ce5ee75a39721a7818b0164bc97dece5b74aec2032c3b0027316995d83c077352e93fd2f7ab319d1801ed5ce356b857805e855db71cd75 diff --git a/lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch b/lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch deleted file mode 100644 index be6c0164..00000000 --- a/lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 6add4e4f0040693e7c4242fbae48c9d32007686c Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Fri, 3 Feb 2023 08:11:04 +0900 -Subject: [PATCH] lxqt-config-monitor: add more header file inclusion for - libkscreen 5.26.90 (#915) - -With https://github.com/KDE/libkscreen/commit/94f330959b0eda775418aef7faee80ce69144e63 , -`#include ` no longer includes "mode.h" implicitly. -So in lxqt-config-monitor, files using `class KScreen::Mode` should include -`#include ` explicitly. - -Related: #903 . ---- - lxqt-config-monitor/kscreenutils.cpp | 1 + - lxqt-config-monitor/loadsettings.cpp | 1 + - lxqt-config-monitor/monitorpicture.cpp | 1 + - lxqt-config-monitor/monitorsettingsdialog.cpp | 1 + - lxqt-config-monitor/monitorwidget.cpp | 1 + - 5 files changed, 5 insertions(+) - -diff --git a/lxqt-config-monitor/kscreenutils.cpp b/lxqt-config-monitor/kscreenutils.cpp -index 9515e789..be2634d7 100644 ---- a/lxqt-config-monitor/kscreenutils.cpp -+++ b/lxqt-config-monitor/kscreenutils.cpp -@@ -2,6 +2,7 @@ - #include "timeoutdialog.h" - - #include -+#include - #include - #include - #include -diff --git a/lxqt-config-monitor/loadsettings.cpp b/lxqt-config-monitor/loadsettings.cpp -index 0c7bd73c..4e9331ba 100644 ---- a/lxqt-config-monitor/loadsettings.cpp -+++ b/lxqt-config-monitor/loadsettings.cpp -@@ -23,6 +23,7 @@ - #include "kscreenutils.h" - #include - #include -+#include - #include - #include - #include -diff --git a/lxqt-config-monitor/monitorpicture.cpp b/lxqt-config-monitor/monitorpicture.cpp -index 0d06ab82..4cb14894 100644 ---- a/lxqt-config-monitor/monitorpicture.cpp -+++ b/lxqt-config-monitor/monitorpicture.cpp -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - - #include "configure.h" -diff --git a/lxqt-config-monitor/monitorsettingsdialog.cpp b/lxqt-config-monitor/monitorsettingsdialog.cpp -index 6172019f..bfd8c1dd 100644 ---- a/lxqt-config-monitor/monitorsettingsdialog.cpp -+++ b/lxqt-config-monitor/monitorsettingsdialog.cpp -@@ -28,6 +28,7 @@ - #include "kscreenutils.h" - - #include -+#include - #include - #include - #include -diff --git a/lxqt-config-monitor/monitorwidget.cpp b/lxqt-config-monitor/monitorwidget.cpp -index e0fcf0a8..41883c25 100644 ---- a/lxqt-config-monitor/monitorwidget.cpp -+++ b/lxqt-config-monitor/monitorwidget.cpp -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - - #include diff --git a/lxqt-base/lxqt-config/lxqt-config-1.2.0-r3.ebuild b/lxqt-base/lxqt-config/lxqt-config-1.2.0-r3.ebuild deleted file mode 100644 index b4492330..00000000 --- a/lxqt-base/lxqt-config/lxqt-config-1.2.0-r3.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PV="$(ver_cut 1-2)" - -inherit cmake xdg-utils - -DESCRIPTION="LXQt system configuration control center" -HOMEPAGE="https://lxqt-project.org/" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" -else - SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~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.15:5 -" -DEPEND=" - >=dev-libs/libqtxdg-3.9.0 - >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtgui-5.15:5 - >=dev-qt/qtwidgets-5.15:5 - >=dev-qt/qtsvg-5.15:5 - >=dev-qt/qtx11extras-5.15:5 - >=dev-qt/qtxml-5.15:5 - =lxqt-base/liblxqt-${MY_PV}*:= - 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/libXi - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/"${PN}"-kscreen-52690.patch ) - -src_prepare() { - if use gtk; then - PATCHES+=( "${FILESDIR}"/"${PN}"-qgtk2.patch ) - fi - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DWITH_MONITOR=$(usex monitor) - -DWITH_TOUCHPAD=$(usex touchpad) - ) - cmake_src_configure -} - -src_install() { - cmake_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-1.3.0-r1.ebuild b/lxqt-base/lxqt-config/lxqt-config-1.3.0-r1.ebuild new file mode 100644 index 00000000..94cca942 --- /dev/null +++ b/lxqt-base/lxqt-config/lxqt-config-1.3.0-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV="$(ver_cut 1-2)" + +inherit cmake xdg-utils + +DESCRIPTION="LXQt system configuration control center" +HOMEPAGE="https://lxqt-project.org/" + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" +else + SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~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.15:5 +" +DEPEND=" + >=dev-libs/libqtxdg-3.9.0 + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtgui-5.15:5 + >=dev-qt/qtwidgets-5.15:5 + >=dev-qt/qtsvg-5.15:5 + >=dev-qt/qtx11extras-5.15:5 + >=dev-qt/qtxml-5.15:5 + =lxqt-base/liblxqt-${MY_PV}*:= + 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/libXi + ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + if use gtk; then + PATCHES=( "${FILESDIR}"/"${PN}"-qgtk2.patch ) + fi + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DWITH_MONITOR=$(usex monitor) + -DWITH_TOUCHPAD=$(usex touchpad) + ) + cmake_src_configure +} + +src_install() { + cmake_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