diff options
| -rw-r--r-- | lxqt-base/lxqt-config/Manifest | 2 | ||||
| -rw-r--r-- | lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch | 80 | ||||
| -rw-r--r-- | lxqt-base/lxqt-config/lxqt-config-1.3.0-r1.ebuild (renamed from lxqt-base/lxqt-config/lxqt-config-1.2.0-r3.ebuild) | 4 | ||||
| -rw-r--r-- | metadata/md5-cache/dev-util/lxqt-build-tools-0.12.0-r2 | 14 | ||||
| -rw-r--r-- | metadata/md5-cache/lxqt-base/lxqt-config-1.3.0-r1 (renamed from metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r3) | 8 | ||||
| -rw-r--r-- | metadata/pkg_desc_index | 3 |
6 files changed, 7 insertions, 104 deletions
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 <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-r3.ebuild b/lxqt-base/lxqt-config/lxqt-config-1.3.0-r1.ebuild index b4492330..94cca942 100644 --- a/lxqt-base/lxqt-config/lxqt-config-1.2.0-r3.ebuild +++ b/lxqt-base/lxqt-config/lxqt-config-1.3.0-r1.ebuild @@ -49,11 +49,9 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}"/"${PN}"-kscreen-52690.patch ) - src_prepare() { if use gtk; then - PATCHES+=( "${FILESDIR}"/"${PN}"-qgtk2.patch ) + PATCHES=( "${FILESDIR}"/"${PN}"-qgtk2.patch ) fi cmake_src_prepare } diff --git a/metadata/md5-cache/dev-util/lxqt-build-tools-0.12.0-r2 b/metadata/md5-cache/dev-util/lxqt-build-tools-0.12.0-r2 deleted file mode 100644 index 62e1c24d..00000000 --- a/metadata/md5-cache/dev-util/lxqt-build-tools-0.12.0-r2 +++ /dev/null @@ -1,14 +0,0 @@ -BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 -DEFINED_PHASES=compile configure install prepare test -DEPEND=>=dev-libs/glib-2.50.0 >=dev-qt/qtcore-5.15:5 -DESCRIPTION=LXQt Build Tools -EAPI=8 -HOMEPAGE=https://lxqt-project.org/ -INHERIT=cmake -KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86 -LICENSE=BSD -RDEPEND=>=dev-libs/glib-2.50.0 >=dev-qt/qtcore-5.15:5 -SLOT=0 -SRC_URI=https://github.com/lxqt/lxqt-build-tools/releases/download/0.12.0/lxqt-build-tools-0.12.0.tar.xz -_eclasses_=cmake 7fb5980de96325cbab639f5b2187357c flag-o-matic 514815b1cc0dd4aeac177c2e812b3b1a multilib d1408425c7c4a7669b9b17735404b693 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 76050953ad5b70d7e09a6ca55558db92 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e xdg-utils baea6080dd821f5562d715887954c9d3 -_md5_=a9ce790bbe0d40a83f838c07bbff4ef0 diff --git a/metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r3 b/metadata/md5-cache/lxqt-base/lxqt-config-1.3.0-r1 index 29d1076b..6050acec 100644 --- a/metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r3 +++ b/metadata/md5-cache/lxqt-base/lxqt-config-1.3.0-r1 @@ -1,6 +1,6 @@ BDEPEND=>=dev-qt/linguist-tools-5.15:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 DEFINED_PHASES=compile configure install postinst postrm prepare test -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-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/libXi ) +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-1.3*:= 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 ) DESCRIPTION=LXQt system configuration control center EAPI=8 HOMEPAGE=https://lxqt-project.org/ @@ -8,8 +8,8 @@ INHERIT=cmake xdg-utils IUSE=gtk +monitor +touchpad KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 LICENSE=GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2 -RDEPEND=>=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-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/libXi ) +RDEPEND=>=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-1.3*:= 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 ) SLOT=0 -SRC_URI=https://github.com/lxqt/lxqt-config/releases/download/1.2.0/lxqt-config-1.2.0.tar.xz +SRC_URI=https://github.com/lxqt/lxqt-config/releases/download/1.3.0/lxqt-config-1.3.0.tar.xz _eclasses_=cmake 7fb5980de96325cbab639f5b2187357c flag-o-matic 514815b1cc0dd4aeac177c2e812b3b1a multilib d1408425c7c4a7669b9b17735404b693 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 76050953ad5b70d7e09a6ca55558db92 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e xdg-utils baea6080dd821f5562d715887954c9d3 -_md5_=42e3f3b3b6984fd7f3e28598748a2da8 +_md5_=18dc9bb4b9e254b38010892c1ea9887d diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 074ff336..9080d968 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -22,12 +22,11 @@ dev-python/click 7.1.2-r100: A Python package for creating beautiful command lin dev-python/sh 1.12.14-r5: Python process launching dev-python/typer 0.2.1-r3: Build great CLIs. Easy to code. Based on Python type hints dev-python/wget 2.2-r3: Python library for downloading from http URLs -dev-util/lxqt-build-tools 0.12.0-r2: LXQt Build Tools gui-libs/display-manager-init 1.1.2-r1: RC init files for starting display and login managers kde-plasma/kinfocenter 5.27.4-r5: Utility providing information about the computer hardware kde-plasma/plasma-meta 5.27.4-r5: Merge this to pull in all Plasma 5 packages lxde-base/lxappearance 0.6.3-r5: LXDE GTK+ theme switcher -lxqt-base/lxqt-config 1.2.0-r3: LXQt system configuration control center +lxqt-base/lxqt-config 1.3.0-r1: LXQt system configuration control center lxqt-base/lxqt-meta 1.2.0-r1: Meta ebuild for LXQt, the Lightweight Desktop Environment lxqt-base/lxqt-session 1.2.0-r2: LXQt Session Manager mail-client/mailspring 1.9.2-r1: A beautiful fast and maintained fork of Nylas Mail |