summaryrefslogtreecommitdiff
path: root/lxqt-base/lxqt-config
diff options
context:
space:
mode:
Diffstat (limited to 'lxqt-base/lxqt-config')
-rw-r--r--lxqt-base/lxqt-config/Manifest2
-rw-r--r--lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch83
-rw-r--r--lxqt-base/lxqt-config/lxqt-config-1.2.0-r1.ebuild76
3 files changed, 161 insertions, 0 deletions
diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest
index 243e3407faf2..5887abb389ae 100644
--- a/lxqt-base/lxqt-config/Manifest
+++ b/lxqt-base/lxqt-config/Manifest
@@ -1,5 +1,7 @@
+AUX lxqt-config-kscreen-52690.patch 2956 BLAKE2B d8366b4fba22a7bc2df121bb9501a101924cf5f3519e42416ce9b44d5782fe4508a0edb3f8471113e1dc3fe6dbb6b8f286b87e38f41ebadae2ad834ffa1aad33 SHA512 53316494fce0962696abfd8d9da972b3b3920de1c7587b8b6df480792cd607edcebf2c8c0074f184fb72b5333c1441d8247c58f313e67cc25f3da71cbc85ef6a
DIST lxqt-config-1.1.0.tar.xz 359900 BLAKE2B 42621ccdd62af82e6d933d71b74fe4f8d27aad4a2c8aab8d04747670d87df2379f5877c0e4aacc29958e273e095c849d261456ef142021857e5da29c3abbd7f8 SHA512 f0272737c5127492f9cd560a831720a7df6ced326109739fcd0f429c45f8d62e4685c438424c5efe4f4927339de7a5f6849560ee5f9901768db5d8511406bb21
DIST lxqt-config-1.2.0.tar.xz 364972 BLAKE2B 2c4082f8b70284492d02372e03088dbade48a8288cd2e0038dd60fd4a70c4ff434188d795ec75bbd268ea3d75661751230c06a74f1cd65273934f89604c7170d SHA512 ae0f71a6ac85e80bc1d1de890148b908bda21aced0829f5f203442f3a0139dbeec44e7190adc1f5706361f4cf7a00bdead3035c63bf6da2bbba5a16a88d7b469
EBUILD lxqt-config-1.1.0.ebuild 1445 BLAKE2B b6f7ebd7698443aa35ad9bb6b1ca177ed6cfeda423ae54178248d1c6bb8c196ab55ea74352a8abced40fe0239d24a458303d5c4f612e05c7c87f3946fd394100 SHA512 5898a730df6fc4c5c05d86f493df574ea7a0a517a13f74b40e2c65185013f6aa81c64e0cf9efeb19aaa3e4c9401c8b5a6469c697664b098ea84974a936243dc7
+EBUILD lxqt-config-1.2.0-r1.ebuild 1585 BLAKE2B 301b0cd8e38f2d792e79a46a5b5a4045df739459aab1a46e0c62a0cf71446963ed56a09c1a58d64573ec2e56c0ca45b63ae33a3cd02b374cdf289a4e00e53d6d SHA512 015e25dbf35f89bb691221b57b5499d62016a80a9aa658ea773ac628c26d0b93e4f1008ccf0a243ef3fa406818185bdfcaa36fb1e42665af80bb5073672a735a
EBUILD lxqt-config-1.2.0.ebuild 1447 BLAKE2B 8de2b43596924f8f22dac0e9be16ccdb3369b6dda107a100f785df2b78cccc491940b24bb1ffe62dd56d4ac8b1e4daa0a5587dda2bbdb899f162d82a40229124 SHA512 cc565c8e852eb2d8d7e2a83aafd86b6af0f68b145be1b3927b7ea10b3ebda0e3b06e18c6d593b29928c3d4cf3e90d4fae7b2302b06fec2bf43d4d1f12797948d
MISC metadata.xml 451 BLAKE2B 6a32cdd63a8414bf7416ff5cd40c490b703ab115790119e3b2c77ba7fcba9d5b164117a2183f51622a3a2716afaf2440fa66ddef3b5d778a46a5a5e185ef5cb1 SHA512 e181838ee5cefbad064504db84b53db0591eb1bbb476c966f076eeae313f5f94b172c952a7f2d340e4e7ac539bee69884ce583569bad13b4147f8de67adda985
diff --git a/lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch b/lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch
new file mode 100644
index 000000000000..6ccd4184bbbb
--- /dev/null
+++ b/lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch
@@ -0,0 +1,83 @@
+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
new file mode 100644
index 000000000000..9c844e54daa9
--- /dev/null
+++ b/lxqt-base/lxqt-config/lxqt-config-1.2.0-r1.ebuild
@@ -0,0 +1,76 @@
+# 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
+}