diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2023-06-18 11:21:11 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2023-06-18 16:53:08 +0200 |
commit | a1e268759c2b42b8755442e08b5d81500b89ee7a (patch) | |
tree | 9f2a9d2919ac4c722fe87ff076198a21e5444dc2 | |
parent | lxqt-base/lxqt-admin: drop 1.2.0 (diff) | |
download | gentoo-a1e268759c2b42b8755442e08b5d81500b89ee7a.tar.gz gentoo-a1e268759c2b42b8755442e08b5d81500b89ee7a.tar.bz2 gentoo-a1e268759c2b42b8755442e08b5d81500b89ee7a.zip |
lxqt-base/lxqt-config: drop 1.2.0, 1.2.0-r1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r-- | lxqt-base/lxqt-config/Manifest | 1 | ||||
-rw-r--r-- | lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch | 83 | ||||
-rw-r--r-- | lxqt-base/lxqt-config/lxqt-config-1.2.0-r1.ebuild | 76 | ||||
-rw-r--r-- | lxqt-base/lxqt-config/lxqt-config-1.2.0.ebuild | 72 |
4 files changed, 0 insertions, 232 deletions
diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest index 5743629277c1..bb8582ddbbb9 100644 --- a/lxqt-base/lxqt-config/Manifest +++ b/lxqt-base/lxqt-config/Manifest @@ -1,2 +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 6ccd4184bbbb..000000000000 --- a/lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch +++ /dev/null @@ -1,83 +0,0 @@ -Gentoo Bug: https://bugs.gentoo.org/894468 -Upstream: https://github.com/lxqt/lxqt-config/pull/915 - -From 6add4e4f0040693e7c4242fbae48c9d32007686c Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA <mtasaka@fedoraproject.org> -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 <KScreen/Output>` no longer includes "mode.h" implicitly. -So in lxqt-config-monitor, files using `class KScreen::Mode` should include -`#include <KScreen/Mode>` 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 <KScreen/Output> -+#include <KScreen/Mode> - #include <KScreen/Config> - #include <KScreen/GetConfigOperation> - #include <KScreen/SetConfigOperation> -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 <KScreen/Output> - #include <KScreen/Config> -+#include <KScreen/Mode> - #include <KScreen/GetConfigOperation> - #include <KScreen/SetConfigOperation> - #include <LXQt/Settings> -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 <QDebug> - #include <QVector2D> - #include <QRectF> -+#include <KScreen/Mode> - #include <QScrollBar> - - #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 <KScreen/Output> -+#include <KScreen/Mode> - #include <QJsonObject> - #include <QJsonArray> - #include <LXQt/Settings> -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 <QComboBox> - #include <QStringBuilder> - #include <QDialogButtonBox> -+#include <KScreen/Mode> - #include <KScreen/EDID> - - #include <algorithm> diff --git a/lxqt-base/lxqt-config/lxqt-config-1.2.0-r1.ebuild b/lxqt-base/lxqt-config/lxqt-config-1.2.0-r1.ebuild deleted file mode 100644 index 86fef3f80448..000000000000 --- a/lxqt-base/lxqt-config/lxqt-config-1.2.0-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2023 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="+monitor +touchpad" - -BDEPEND=" - >=dev-qt/linguist-tools-5.15:5 -" -DEPEND=" - >=dev-libs/libqtxdg-3.10.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}" - -# https://bugs.gentoo.org/894468 -# https://github.com/lxqt/lxqt-config/pull/915 -PATCHES=( "${FILESDIR}"/"${PN}"-kscreen-52690.patch ) - -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.2.0.ebuild b/lxqt-base/lxqt-config/lxqt-config-1.2.0.ebuild deleted file mode 100644 index 27090e0564dc..000000000000 --- a/lxqt-base/lxqt-config/lxqt-config-1.2.0.ebuild +++ /dev/null @@ -1,72 +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="+monitor +touchpad" - -BDEPEND=" - >=dev-qt/linguist-tools-5.15:5 -" -DEPEND=" - >=dev-libs/libqtxdg-3.10.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_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 -} |