diff options
-rw-r--r-- | lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch (renamed from lxqt-base/lxqt-config/files/kscreen.patch) | 0 | ||||
-rw-r--r-- | lxqt-base/lxqt-config/files/lxqt-config-qgtk2.patch (renamed from lxqt-base/lxqt-config/files/qgtk2.patch) | 0 | ||||
-rw-r--r-- | lxqt-base/lxqt-config/lxqt-config-1.2.0-r3.ebuild (renamed from lxqt-base/lxqt-config/lxqt-config-1.2.0-r2.ebuild) | 13 | ||||
-rw-r--r-- | metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r3 (renamed from metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r2) | 4 | ||||
-rw-r--r-- | metadata/pkg_desc_index | 2 |
5 files changed, 8 insertions, 11 deletions
diff --git a/lxqt-base/lxqt-config/files/kscreen.patch b/lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch index be6c0164..be6c0164 100644 --- a/lxqt-base/lxqt-config/files/kscreen.patch +++ b/lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch diff --git a/lxqt-base/lxqt-config/files/qgtk2.patch b/lxqt-base/lxqt-config/files/lxqt-config-qgtk2.patch index bf684cdf..bf684cdf 100644 --- a/lxqt-base/lxqt-config/files/qgtk2.patch +++ b/lxqt-base/lxqt-config/files/lxqt-config-qgtk2.patch diff --git a/lxqt-base/lxqt-config/lxqt-config-1.2.0-r2.ebuild b/lxqt-base/lxqt-config/lxqt-config-1.2.0-r3.ebuild index 936fe47f..b4492330 100644 --- a/lxqt-base/lxqt-config/lxqt-config-1.2.0-r2.ebuild +++ b/lxqt-base/lxqt-config/lxqt-config-1.2.0-r3.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then 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" + 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" @@ -49,16 +49,13 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}"/"${PN}"-kscreen-52690.patch ) + 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 + PATCHES+=( "${FILESDIR}"/"${PN}"-qgtk2.patch ) fi + cmake_src_prepare } src_configure() { 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-r3 index da54c1c0..13698efc 100644 --- a/metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r2 +++ b/metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r3 @@ -6,10 +6,10 @@ EAPI=8 HOMEPAGE=https://lxqt-project.org/ INHERIT=cmake xdg-utils IUSE=gtk +monitor +touchpad -KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 +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 +_md5_=42e3f3b3b6984fd7f3e28598748a2da8 diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 7a9c72d2..4805d2cb 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -25,7 +25,7 @@ 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.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-r2: LXQt system configuration control center +lxqt-base/lxqt-config 1.2.0-r3: 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 |