From bf6f5cf581eaa10d6ba1d58622e9d1da529d9f67 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 14 Feb 2023 21:45:47 +0000 Subject: lxqt-base/lxqt-config : fix build against >=kde-plasma/libkscreen-5.26.90 --- lxqt-base/lxqt-config/files/kscreen.patch | 80 ++++++++++++++++++++++ lxqt-base/lxqt-config/lxqt-config-1.2.0-r1.ebuild | 80 ---------------------- lxqt-base/lxqt-config/lxqt-config-1.2.0-r2.ebuild | 83 +++++++++++++++++++++++ metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r1 | 15 ---- metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r2 | 15 ++++ metadata/pkg_desc_index | 2 +- 6 files changed, 179 insertions(+), 96 deletions(-) create mode 100644 lxqt-base/lxqt-config/files/kscreen.patch delete mode 100644 lxqt-base/lxqt-config/lxqt-config-1.2.0-r1.ebuild create mode 100644 lxqt-base/lxqt-config/lxqt-config-1.2.0-r2.ebuild delete mode 100644 metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r1 create mode 100644 metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r2 diff --git a/lxqt-base/lxqt-config/files/kscreen.patch b/lxqt-base/lxqt-config/files/kscreen.patch new file mode 100644 index 00000000..be6c0164 --- /dev/null +++ b/lxqt-base/lxqt-config/files/kscreen.patch @@ -0,0 +1,80 @@ +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-r1.ebuild b/lxqt-base/lxqt-config/lxqt-config-1.2.0-r1.ebuild deleted file mode 100644 index ced25d45..00000000 --- a/lxqt-base/lxqt-config/lxqt-config-1.2.0-r1.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}" - -src_prepare() { - if use gtk; then - eapply "${FILESDIR}"/qgtk2.patch - cmake_src_prepare - else - cmake_src_prepare - fi -} - -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-r2.ebuild b/lxqt-base/lxqt-config/lxqt-config-1.2.0-r2.ebuild new file mode 100644 index 00000000..936fe47f --- /dev/null +++ b/lxqt-base/lxqt-config/lxqt-config-1.2.0-r2.ebuild @@ -0,0 +1,83 @@ +# 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 has_version ">=kde-plasma/libkscreen-5.26.90" ; then + eapply "${FILESDIR}"/kscreen.patch + fi + if use gtk; then + eapply "${FILESDIR}"/qgtk2.patch + cmake_src_prepare + else + cmake_src_prepare + fi +} + +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/metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r1 b/metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r1 deleted file mode 100644 index 32551881..00000000 --- a/metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r1 +++ /dev/null @@ -1,15 +0,0 @@ -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 ) -DESCRIPTION=LXQt system configuration control center -EAPI=8 -HOMEPAGE=https://lxqt-project.org/ -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 ) -SLOT=0 -SRC_URI=https://github.com/lxqt/lxqt-config/releases/download/1.2.0/lxqt-config-1.2.0.tar.xz -_eclasses_=cmake 449b4785acace35308fe747fc939bde1 flag-o-matic 69394e25812406faa1f90edaf4969395 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 38c85b725d0467e51954ea921b6c104b toolchain-funcs 9a610728b9bcca1919234cceb35a1027 xdg-utils ac0e315a3688929e34ac75b139e7349a -_md5_=00dcf67e7f2e59a4e650d0b3b79c02c2 diff --git a/metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r2 b/metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r2 new file mode 100644 index 00000000..da54c1c0 --- /dev/null +++ b/metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r2 @@ -0,0 +1,15 @@ +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 ) +DESCRIPTION=LXQt system configuration control center +EAPI=8 +HOMEPAGE=https://lxqt-project.org/ +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 ) +SLOT=0 +SRC_URI=https://github.com/lxqt/lxqt-config/releases/download/1.2.0/lxqt-config-1.2.0.tar.xz +_eclasses_=cmake 449b4785acace35308fe747fc939bde1 flag-o-matic 69394e25812406faa1f90edaf4969395 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 38c85b725d0467e51954ea921b6c104b toolchain-funcs 9a610728b9bcca1919234cceb35a1027 xdg-utils ac0e315a3688929e34ac75b139e7349a +_md5_=38bc9976df482e2b42714d75bba73610 diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 3c9936f4..b2484ec7 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -25,7 +25,7 @@ dev-util/lxqt-build-tools 0.12.0-r1: 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.0-r5: Utility providing information about the computer hardware lxde-base/lxappearance 0.6.3-r5: LXDE GTK+ theme switcher -lxqt-base/lxqt-config 1.2.0-r1: LXQt system configuration control center +lxqt-base/lxqt-config 1.2.0-r2: 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-r1: LXQt Session Manager mail-client/mailspring 1.9.2-r1: A beautiful fast and maintained fork of Nylas Mail -- cgit v1.2.3