diff options
Diffstat (limited to 'lxqt-base')
| -rw-r--r-- | lxqt-base/lxqt-config/Manifest | 2 | ||||
| -rw-r--r-- | lxqt-base/lxqt-config/files/lxqt-config-qt5ct.patch (renamed from lxqt-base/lxqt-config/files/lxqt-config-qgtk2.patch) | 12 | ||||
| -rw-r--r-- | lxqt-base/lxqt-config/lxqt-config-2.0.0-r1.ebuild (renamed from lxqt-base/lxqt-config/lxqt-config-1.4.0-r1.ebuild) | 31 | ||||
| -rw-r--r-- | lxqt-base/lxqt-meta/lxqt-meta-1.4.0-r1.ebuild | 77 | ||||
| -rw-r--r-- | lxqt-base/lxqt-meta/lxqt-meta-2.0.0-r4.ebuild | 80 | ||||
| -rw-r--r-- | lxqt-base/lxqt-session/Manifest | 2 | ||||
| -rw-r--r-- | lxqt-base/lxqt-session/files/lxqt-session-qt5ct.patch (renamed from lxqt-base/lxqt-session/files/lxqt-session-platform-plugin.patch) | 8 | ||||
| -rw-r--r-- | lxqt-base/lxqt-session/files/session.conf | 3 | ||||
| -rw-r--r-- | lxqt-base/lxqt-session/lxqt-session-2.0.0-r1.ebuild (renamed from lxqt-base/lxqt-session/lxqt-session-1.4.0-r1.ebuild) | 41 |
9 files changed, 117 insertions, 139 deletions
diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest index cb27c412..5d8d5a46 100644 --- a/lxqt-base/lxqt-config/Manifest +++ b/lxqt-base/lxqt-config/Manifest @@ -1 +1 @@ -DIST lxqt-config-1.4.0.tar.xz 371628 BLAKE2B d7be05fdd55bfe2efe977184008ed6324e16e85c2bceb6b9c15e8ef11978d34ba0961b671978618ce4b7a836653477c4fa5cbc9b5dfead7a1c8a87e00c408bbd SHA512 a3e6722c3f63b3c7382ec84723e3a4d838d99b2c42ce731565f940873b275ef025b7bc1a570f165b7fce521eb77bb7b83b02e922bee251507b773c8de4f785fc +DIST lxqt-config-2.0.0.tar.xz 380552 BLAKE2B 5b6dc5f1323609b487608efabcd3b3a2b2d14ee0374a9959b9ee1627146232ff8d91ea244b243a342217f06613424e5e0dca0b89bfef99771dcf8018fccba2ea SHA512 dbb96a069fa0b73c5e7cb6ed26d99ddf838df363b3dba5c6f8ac3dde4ab316646c6bea6fd6d463d9ddc76c38ce8b75dbf1fadc7e56d4c548a54c6d53b494bce3 diff --git a/lxqt-base/lxqt-config/files/lxqt-config-qgtk2.patch b/lxqt-base/lxqt-config/files/lxqt-config-qt5ct.patch index bf684cdf..7b6dba8b 100644 --- a/lxqt-base/lxqt-config/files/lxqt-config-qgtk2.patch +++ b/lxqt-base/lxqt-config/files/lxqt-config-qt5ct.patch @@ -1,6 +1,6 @@ -diff -Nur a/lxqt-config-appearance/main.cpp b/lxqt-config-appearance/main.cpp ---- a/lxqt-config-appearance/main.cpp 2022-04-16 13:47:00.000000000 +0100 -+++ b/lxqt-config-appearance/main.cpp 2022-10-18 17:02:41.305914551 +0100 +diff '--color=auto' -Nur a/lxqt-config-appearance/main.cpp b/lxqt-config-appearance/main.cpp +--- a/lxqt-config-appearance/main.cpp 2024-04-17 12:00:51.000000000 +0100 ++++ b/lxqt-config-appearance/main.cpp 2024-09-30 03:31:04.883188155 +0100 @@ -33,12 +33,8 @@ #include <QMessageBox> #include <QGuiApplication> @@ -14,7 +14,7 @@ diff -Nur a/lxqt-config-appearance/main.cpp b/lxqt-config-appearance/main.cpp #include "../liblxqt-config-cursor/selectwnd.h" -@@ -70,24 +66,6 @@ +@@ -69,24 +65,6 @@ QSettings& qtSettings = *settings; // use lxqt config file for Qt settings in Qt5. @@ -39,7 +39,7 @@ diff -Nur a/lxqt-config-appearance/main.cpp b/lxqt-config-appearance/main.cpp /*** LXQt Theme ***/ LXQtThemeConfig* themePage = new LXQtThemeConfig(settings, dialog); dialog->addPage(themePage, QObject::tr("LXQt Theme"), QStringList() << QStringLiteral("preferences-desktop-color") << QStringLiteral("preferences-desktop")); -@@ -96,15 +74,6 @@ +@@ -95,15 +73,6 @@ dialog->enableButton(QDialogButtonBox::Apply, true); }); @@ -55,7 +55,7 @@ diff -Nur a/lxqt-config-appearance/main.cpp b/lxqt-config-appearance/main.cpp /*** Cursor Theme ***/ SelectWnd* cursorPage = new SelectWnd(sessionSettings, dialog); cursorPage->setCurrent(); -@@ -113,25 +82,13 @@ +@@ -112,25 +81,13 @@ dialog->enableButton(QDialogButtonBox::Apply, true); }); diff --git a/lxqt-base/lxqt-config/lxqt-config-1.4.0-r1.ebuild b/lxqt-base/lxqt-config/lxqt-config-2.0.0-r1.ebuild index 1d2b2fe2..6564120d 100644 --- a/lxqt-base/lxqt-config/lxqt-config-1.4.0-r1.ebuild +++ b/lxqt-base/lxqt-config/lxqt-config-2.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,29 +10,26 @@ inherit cmake xdg-utils DESCRIPTION="LXQt system configuration control center" HOMEPAGE="https://lxqt-project.org/" -if [[ ${PV} = *9999* ]]; then +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" + KEYWORDS="amd64 arm64 ~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" +IUSE="+monitor +touchpad" BDEPEND=" - >=dev-qt/linguist-tools-5.15:5 + >=dev-qt/qttools-6.6:6[linguist] + >=dev-util/lxqt-build-tools-2.0.0 " DEPEND=" - >=dev-libs/libqtxdg-3.11.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 + >=dev-libs/libqtxdg-4.0.0 + >=dev-qt/qtbase-6.6:6[gui,widgets,xml] + >=dev-qt/qtsvg-6.6:6 =lxqt-base/liblxqt-${MY_PV}*:= =lxqt-base/lxqt-menu-data-${MY_PV}* sys-libs/zlib:= @@ -41,7 +38,7 @@ DEPEND=" x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes - monitor? ( kde-plasma/libkscreen:5= ) + monitor? ( kde-plasma/libkscreen:6= ) touchpad? ( virtual/libudev:= x11-drivers/xf86-input-libinput @@ -50,18 +47,14 @@ DEPEND=" " RDEPEND="${DEPEND}" -src_prepare() { - if use gtk; then - PATCHES=( "${FILESDIR}"/"${PN}"-qgtk2.patch ) - fi - cmake_src_prepare -} +PATCHES=( "${FILESDIR}"/"${PN}"-qt5ct.patch ) src_configure() { local mycmakeargs=( -DWITH_MONITOR=$(usex monitor) -DWITH_TOUCHPAD=$(usex touchpad) ) + cmake_src_configure } diff --git a/lxqt-base/lxqt-meta/lxqt-meta-1.4.0-r1.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-1.4.0-r1.ebuild deleted file mode 100644 index 6cf3043c..00000000 --- a/lxqt-base/lxqt-meta/lxqt-meta-1.4.0-r1.ebuild +++ /dev/null @@ -1,77 +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)" - -DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment" -HOMEPAGE="https://lxqt-project.org/" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -fi - -LICENSE="metapackage" -SLOT="0" - -IUSE="+about admin archiver +desktop-portal discover +display-manager +filemanager gtk -lximage minimal networkmanager nls +policykit powermanagement processviewer screenshot -+sddm ssh-askpass sudo terminal +trash" - -REQUIRED_USE="trash? ( filemanager )" - -# Note: we prefer kde-frameworks/oxygen-icons over other icon sets, as the initial -# install expects oxygen icons, until the user specifies otherwise (bug 543380) - -# For lxqt-themes there is no release 1.4.0 at this time. - -RDEPEND=" - kde-frameworks/oxygen-icons - >=lxde-base/lxmenu-data-0.1.5 - >=lxde-base/lxappearance-0.5.5 - =lxqt-base/lxqt-config-${MY_PV}* - =lxqt-base/lxqt-globalkeys-${MY_PV}* - =lxqt-base/lxqt-menu-data-${MY_PV}* - =lxqt-base/lxqt-notificationd-${MY_PV}* - =lxqt-base/lxqt-panel-${MY_PV}* - =lxqt-base/lxqt-runner-${MY_PV}* - =lxqt-base/lxqt-session-${MY_PV}* - virtual/ttf-fonts - x11-terms/xterm - >=x11-themes/lxqt-themes-1.3.0 - about? ( =lxqt-base/lxqt-about-${MY_PV}* ) - admin? ( =lxqt-base/lxqt-admin-${MY_PV}* ) - archiver? ( app-arch/lxqt-archiver ) - desktop-portal? ( gui-libs/xdg-desktop-portal-lxqt ) - discover? ( kde-plasma/discover ) - display-manager? ( - sddm? ( >=x11-misc/sddm-0.11.0 ) - !sddm? ( x11-misc/lightdm ) - ) - filemanager? ( =x11-misc/pcmanfm-qt-${MY_PV}* ) - gtk? ( - dev-qt/qtstyleplugins - x11-libs/gtk+:2 - ) - !gtk? ( =lxqt-base/lxqt-qtplugin-${MY_PV}* ) - lximage? ( media-gfx/lximage-qt ) - !minimal? ( - x11-wm/openbox - x11-misc/obconf-qt - ) - networkmanager? ( - net-misc/networkmanager - gnome-extra/nm-applet - ) - nls? ( dev-qt/qttranslations:5 ) - policykit? ( =lxqt-base/lxqt-policykit-${MY_PV}* ) - powermanagement? ( =lxqt-base/lxqt-powermanagement-${MY_PV}* ) - processviewer? ( x11-misc/qps:0 ) - screenshot? ( x11-misc/screengrab:0 ) - sddm? ( >=x11-misc/sddm-0.11.0 ) - ssh-askpass? ( =lxqt-base/lxqt-openssh-askpass-${MY_PV}* ) - sudo? ( =lxqt-base/lxqt-sudo-${MY_PV}* ) - terminal? ( x11-terms/qterminal:0 ) - trash? ( gnome-base/gvfs ) -" diff --git a/lxqt-base/lxqt-meta/lxqt-meta-2.0.0-r4.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-2.0.0-r4.ebuild new file mode 100644 index 00000000..9dc7f620 --- /dev/null +++ b/lxqt-base/lxqt-meta/lxqt-meta-2.0.0-r4.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV="$(ver_cut 1-2)" + +DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment" +HOMEPAGE="https://lxqt-project.org/" + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="~amd64" +fi + +LICENSE="metapackage" +SLOT="0" + +IUSE=" + +about admin +archiver +desktop-portal discover +display-manager +filemanager gtk + +lximage networkmanager nls +openbox +policykit powermanagement +processviewer + qt5 qt6 +screenshot +sddm ssh-askpass +sudo +terminal +trash +window-manager +" + +REQUIRED_USE="trash? ( filemanager )" + +# Pull in 'kde-frameworks/breeze-icons' as an upstream default. +# https://bugs.gentoo.org/543380 +# https://github.com/lxqt/lxqt-session/commit/5d32ff434d4 +RDEPEND=" + kde-frameworks/breeze-icons:6 + =lxqt-base/lxqt-config-${MY_PV}* + =lxqt-base/lxqt-globalkeys-${MY_PV}* + =lxqt-base/lxqt-menu-data-${MY_PV}* + =lxqt-base/lxqt-notificationd-${MY_PV}* + =lxqt-base/lxqt-panel-${MY_PV}* + =lxqt-base/lxqt-runner-${MY_PV}* + =lxqt-base/lxqt-session-${MY_PV}* + virtual/ttf-fonts + x11-terms/xterm + =x11-themes/lxqt-themes-${MY_PV}* + x11-themes/redcore-theme-lxqt + about? ( =lxqt-base/lxqt-about-${MY_PV}* ) + admin? ( =lxqt-base/lxqt-admin-${MY_PV}* ) + archiver? ( >=app-arch/lxqt-archiver-1.0 ) + desktop-portal? ( >=gui-libs/xdg-desktop-portal-lxqt-1.0 ) + discover? ( kde-plasma/discover ) + display-manager? ( + sddm? ( x11-misc/sddm ) + !sddm? ( x11-misc/lightdm ) + ) + filemanager? ( =x11-misc/pcmanfm-qt-${MY_PV}* ) + gtk? ( lxde-base/lxappearance ) + lximage? ( =media-gfx/lximage-qt-${MY_PV}* ) + networkmanager? ( + net-misc/networkmanager + gnome-extra/nm-applet + ) + nls? ( dev-qt/qttranslations:6 ) + policykit? ( =lxqt-base/lxqt-policykit-${MY_PV}* ) + powermanagement? ( =lxqt-base/lxqt-powermanagement-${MY_PV}* ) + processviewer? ( >=x11-misc/qps-2.9 ) + qt5? ( x11-misc/qt5ct ) + qt6? ( gui-apps/qt6ct ) + screenshot? ( >=x11-misc/screengrab-2.8 ) + sddm? ( x11-misc/sddm ) + ssh-askpass? ( =lxqt-base/lxqt-openssh-askpass-${MY_PV}* ) + sudo? ( =lxqt-base/lxqt-sudo-${MY_PV}* ) + terminal? ( =x11-terms/qterminal-${MY_PV}* ) + trash? ( gnome-base/gvfs ) + window-manager? ( + openbox? ( + x11-wm/openbox + x11-misc/obconf + ) + !openbox? ( + kde-plasma/kwin:6 + kde-plasma/systemsettings:6 + ) + ) +" diff --git a/lxqt-base/lxqt-session/Manifest b/lxqt-base/lxqt-session/Manifest index cba1f55f..98e17f60 100644 --- a/lxqt-base/lxqt-session/Manifest +++ b/lxqt-base/lxqt-session/Manifest @@ -1 +1 @@ -DIST lxqt-session-1.4.0.tar.xz 188324 BLAKE2B 508509a783f747c3dd72984264056466d8f9ef901b4a7731fbecca575951c528231cdb71a799ab7d617ed86c29d9026d9feb8fbb2b795a39958c1948d75812c2 SHA512 4f5731969582222eef9d0d2f2b37c4a160c3c6469f3a16cb4b1804ba76a9320d36b0ed91cada6ee905339ed8cfbd443851804086d978424c4d79045cc90e1629 +DIST lxqt-session-2.0.0.tar.xz 194480 BLAKE2B 18954f9d440ad8a553b9ccf0aa6bb28a971e7d2010a5b8f0dc32080d5829654bdbc5dd5bd292a0285b1e75af4e0cb0fe4585061e86814c0976c69824015719b4 SHA512 c0b8bbcb666b55b0218bfe1e6669fff0de44a89986dae9afb17ae169e13a2816ef56e62d0b9210449023113a8066d45ccef4fa54b0a5c08c60c2ca4311f142ed diff --git a/lxqt-base/lxqt-session/files/lxqt-session-platform-plugin.patch b/lxqt-base/lxqt-session/files/lxqt-session-qt5ct.patch index e61c6ef5..ef83e373 100644 --- a/lxqt-base/lxqt-session/files/lxqt-session-platform-plugin.patch +++ b/lxqt-base/lxqt-session/files/lxqt-session-qt5ct.patch @@ -1,6 +1,6 @@ -diff -Nur a/startlxqt.in b/startlxqt.in ---- a/startlxqt.in 2022-05-08 07:43:56.000000000 +0100 -+++ b/startlxqt.in 2022-10-18 16:22:31.073853351 +0100 +diff '--color=auto' -Nur a/startlxqt.in b/startlxqt.in +--- a/startlxqt.in 2024-04-17 12:22:25.000000000 +0100 ++++ b/startlxqt.in 2024-09-30 03:19:21.606222756 +0100 @@ -53,11 +53,8 @@ fi fi @@ -10,7 +10,7 @@ diff -Nur a/startlxqt.in b/startlxqt.in - # Qt5 platform plugin -export QT_QPA_PLATFORMTHEME=lxqt -+export QT_QPA_PLATFORMTHEME=gtk2 ++export QT_QPA_PLATFORMTHEME=qt5ct # use lxqt-applications.menu for main app menu export XDG_MENU_PREFIX="lxqt-" diff --git a/lxqt-base/lxqt-session/files/session.conf b/lxqt-base/lxqt-session/files/session.conf deleted file mode 100644 index af3161f8..00000000 --- a/lxqt-base/lxqt-session/files/session.conf +++ /dev/null @@ -1,3 +0,0 @@ -[General] -__userfile__=true -window_manager=/usr/bin/openbox diff --git a/lxqt-base/lxqt-session/lxqt-session-1.4.0-r1.ebuild b/lxqt-base/lxqt-session/lxqt-session-2.0.0-r1.ebuild index 09c8856c..a3c8aaff 100644 --- a/lxqt-base/lxqt-session/lxqt-session-1.4.0-r1.ebuild +++ b/lxqt-base/lxqt-session/lxqt-session-2.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,32 +10,28 @@ HOMEPAGE="https://lxqt-project.org/" MY_PV="$(ver_cut 1-2)" -if [[ ${PV} = *9999* ]]; then +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" + KEYWORDS="amd64 arm64 ~riscv ~x86" fi -IUSE="gtk +udev" - LICENSE="LGPL-2.1 LGPL-2.1+" SLOT="0" +IUSE="+udev" BDEPEND=" - >=dev-qt/linguist-tools-5.15:5 - >=dev-util/lxqt-build-tools-0.13.0 + >=dev-qt/qttools-6.6:6[linguist] + >=dev-util/lxqt-build-tools-2.0.0 " DEPEND=" - >=app-misc/qtxdg-tools-3.11.0 - >=dev-libs/libqtxdg-3.12.0 - >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtdbus-5.15:5 - >=dev-qt/qtgui-5.15:5 - >=dev-qt/qtwidgets-5.15:5 - >=dev-qt/qtx11extras-5.15:5 - kde-frameworks/kwindowsystem:5[X] + >=app-misc/qtxdg-tools-4.0.0 + >=dev-libs/libqtxdg-4.0.0 + >=dev-qt/qtbase-6.6:6[dbus,gui,widgets] + kde-frameworks/kwindowsystem:6[X] + kde-plasma/layer-shell-qt:6 =lxqt-base/liblxqt-${MY_PV}*:= sys-process/procps:= x11-libs/libX11 @@ -44,17 +40,13 @@ DEPEND=" " RDEPEND="${DEPEND}" -src_prepare() { - if use gtk; then - PATCHES=( "${FILESDIR}"/"${PN}"-platform-plugin.patch ) - fi - cmake_src_prepare -} +PATCHES=( "${FILESDIR}"/"${PN}"-qt5ct.patch ) src_configure() { local mycmakeargs=( -DWITH_LIBUDEV=$(usex udev) ) + cmake_src_configure } @@ -65,11 +57,4 @@ src_install() { newenvd - 91lxqt-config-dir <<- _EOF_ XDG_CONFIG_DIRS='${EPREFIX}/usr/share' _EOF_ - - dodir "/etc/xdg/lxqt" - insinto "/etc/xdg/lxqt" - doins "${FILESDIR}/session.conf" - - dodir "/etc/X11/Sessions" - dosym "/usr/bin/startlxqt" "/etc/X11/Sessions/lxqt" } |