From 03e68ef708ecc9f7c8a9063cf1a2a29b8670b774 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 17 Dec 2017 10:40:35 +0000 Subject: lxqt-base/lxqt-config : revision bump --- ...-config-hide-unwanted-appearance-settings.patch | 37 ++++++++++++++ lxqt-base/lxqt-config/lxqt-config-0.12.0-r1.ebuild | 54 -------------------- lxqt-base/lxqt-config/lxqt-config-0.12.0-r2.ebuild | 59 ++++++++++++++++++++++ 3 files changed, 96 insertions(+), 54 deletions(-) create mode 100644 lxqt-base/lxqt-config/files/lxqt-config-hide-unwanted-appearance-settings.patch delete mode 100644 lxqt-base/lxqt-config/lxqt-config-0.12.0-r1.ebuild create mode 100644 lxqt-base/lxqt-config/lxqt-config-0.12.0-r2.ebuild diff --git a/lxqt-base/lxqt-config/files/lxqt-config-hide-unwanted-appearance-settings.patch b/lxqt-base/lxqt-config/files/lxqt-config-hide-unwanted-appearance-settings.patch new file mode 100644 index 00000000..872a41b3 --- /dev/null +++ b/lxqt-base/lxqt-config/files/lxqt-config-hide-unwanted-appearance-settings.patch @@ -0,0 +1,37 @@ +diff -Nur a/lxqt-config-appearance/main.cpp b/lxqt-config-appearance/main.cpp +--- a/lxqt-config-appearance/main.cpp 2017-10-21 20:10:53.000000000 +0100 ++++ b/lxqt-config-appearance/main.cpp 2017-12-17 10:18:16.454195148 +0000 +@@ -30,10 +30,7 @@ + #include + #include + #include +-#include "iconthemeconfig.h" + #include "lxqtthemeconfig.h" +-#include "styleconfig.h" +-#include "fontsconfig.h" + + #include "../liblxqt-config-cursor/selectwnd.h" + +@@ -59,22 +56,11 @@ + app.setActivationWindow(dialog); + + QSettings& qtSettings = *settings; // use lxqt config file for Qt settings in Qt5. +- StyleConfig* stylePage = new StyleConfig(settings, &qtSettings, dialog); +- dialog->addPage(stylePage, QObject::tr("Widget Style"), QStringList() << "preferences-desktop-theme" << "preferences-desktop"); +- QObject::connect(dialog, SIGNAL(reset()), stylePage, SLOT(initControls())); +- +- IconThemeConfig* iconPage = new IconThemeConfig(settings, dialog); +- dialog->addPage(iconPage, QObject::tr("Icons Theme"), QStringList() << "preferences-desktop-icons" << "preferences-desktop"); +- QObject::connect(dialog, SIGNAL(reset()), iconPage, SLOT(initControls())); + + LXQtThemeConfig* themePage = new LXQtThemeConfig(settings, dialog); + dialog->addPage(themePage, QObject::tr("LXQt Theme"), QStringList() << "preferences-desktop-color" << "preferences-desktop"); + QObject::connect(dialog, SIGNAL(reset()), themePage, SLOT(initControls())); + +- FontsConfig* fontsPage = new FontsConfig(settings, &qtSettings, dialog); +- dialog->addPage(fontsPage, QObject::tr("Font"), QStringList() << "preferences-desktop-font" << "preferences-desktop"); +- QObject::connect(dialog, SIGNAL(reset()), fontsPage, SLOT(initControls())); +- + SelectWnd* cursorPage = new SelectWnd(sessionSettings, dialog); + cursorPage->setCurrent(); + dialog->addPage(cursorPage, QObject::tr("Cursor"), QStringList() << "input-mouse" << "preferences-desktop"); diff --git a/lxqt-base/lxqt-config/lxqt-config-0.12.0-r1.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.12.0-r1.ebuild deleted file mode 100644 index 2a159420..00000000 --- a/lxqt-base/lxqt-config/lxqt-config-0.12.0-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit cmake-utils - -DESCRIPTION="LXQt system configuration control center" -HOMEPAGE="http://lxqt.org/" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git" -else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -LICENSE="GPL-2 LGPL-2.1+" -SLOT="0" - -CDEPEND=" - >=dev-libs/libqtxdg-3.1.0 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - kde-frameworks/kwindowsystem:5 - kde-plasma/libkscreen:5= - ~lxqt-base/liblxqt-${PV} - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libxcb:= - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXfixes" -DEPEND="${CDEPEND} - dev-qt/linguist-tools:5" -RDEPEND="${CDEPEND} - x11-apps/setxkbmap" - -src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) - cmake-utils_src_configure -} - -src_install(){ - cmake-utils_src_install - doman man/*.1 liblxqt-config-cursor/man/*.1 lxqt-config-appearance/man/*.1 -} diff --git a/lxqt-base/lxqt-config/lxqt-config-0.12.0-r2.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.12.0-r2.ebuild new file mode 100644 index 00000000..1b5e9866 --- /dev/null +++ b/lxqt-base/lxqt-config/lxqt-config-0.12.0-r2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit cmake-utils eutils + +DESCRIPTION="LXQt system configuration control center" +HOMEPAGE="http://lxqt.org/" + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git" +else + SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="GPL-2 LGPL-2.1+" +SLOT="0" + +CDEPEND=" + >=dev-libs/libqtxdg-3.1.0 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + kde-frameworks/kwindowsystem:5 + kde-plasma/libkscreen:5= + ~lxqt-base/liblxqt-${PV} + sys-libs/zlib + x11-libs/libICE + x11-libs/libSM + x11-libs/libxcb:= + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXfixes" +DEPEND="${CDEPEND} + dev-qt/linguist-tools:5" +RDEPEND="${CDEPEND} + x11-apps/setxkbmap" + +src_prepare() { + epatch "${FILESDIR}"/"${PN}"-hide-unwanted-appearance-settings.patch + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) + cmake-utils_src_configure +} + +src_install(){ + cmake-utils_src_install + doman man/*.1 liblxqt-config-cursor/man/*.1 lxqt-config-appearance/man/*.1 +} -- cgit v1.2.3