[gentoo-commits] repo/gentoo:master commit in: lxqt-base/lxqt-config/files/, lxqt-base/lxqt-config/

2023-02-16 Thread Jimi Huotari 
commit: 05b8a0768e6eee3c15d416114fc6c7fd002e8436
Author: V3n3RiX  koprulu  sector>
AuthorDate: Wed Feb 15 23:53:40 2023 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Thu Feb 16 19:16:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05b8a076

lxqt-base/lxqt-config: >=kde-plasma/kscreen-2.6.90 compatibility

- https://github.com/lxqt/lxqt-config/pull/915

Closes: https://bugs.gentoo.org/894468
Closes: https://github.com/gentoo/gentoo/pull/29587
Signed-off-by: Ghiunhan Mamut  redcorelinux.org>
Signed-off-by: Jimi Huotari  gentoo.org>

 .../files/lxqt-config-kscreen-52690.patch  | 83 ++
 lxqt-base/lxqt-config/lxqt-config-1.2.0-r1.ebuild  | 76 
 2 files changed, 159 insertions(+)

diff --git a/lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch 
b/lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch
new file mode 100644
index ..6ccd4184
--- /dev/null
+++ b/lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch
@@ -0,0 +1,83 @@
+Gentoo Bug: https://bugs.gentoo.org/894468
+Upstream: https://github.com/lxqt/lxqt-config/pull/915
+
+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
new file mode 100644
index ..9c844e54daa9
--- /dev/null
+++ b/lxqt-base/lxqt-config/lxqt-config-1.2.0-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 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} = ** ]]; 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="+monitor +touchpad"
+
+BDEPEND="
+   >=dev-qt/linguist-tools-5.15:5
+"
+DEPEND="
+   >=dev-libs/libqtxdg-3.10.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
+

[gentoo-commits] repo/gentoo:master commit in: lxqt-base/lxqt-config/files/, lxqt-base/lxqt-config/

2019-12-23 Thread Andreas Sturmlechner 
commit: e7e02c3059397c8b53457efbb0f72668c2fbdbc3
Author: Jimi Huotari  gentoo  org>
AuthorDate: Mon Dec 23 19:14:43 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 23 21:45:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7e02c30

lxqt-base/lxqt-config: fix build with Qt 5.14

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Jimi Huotari  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/lxqt-config-0.14.1-qt-5.14-build.patch| 21 +
 lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild  |  2 ++
 2 files changed, 23 insertions(+)

diff --git a/lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch 
b/lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch
new file mode 100644
index 000..31b22cd6eaa
--- /dev/null
+++ b/lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch
@@ -0,0 +1,21 @@
+From cd7de12f2ebe5a2ad03c2086da4c3b5317a4506e Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen 
+Date: Sun, 15 Dec 2019 09:32:55 +0800
+Subject: [PATCH] Fix building with Qt 5.14
+
+---
+ lxqt-config-input/touchpaddevice.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lxqt-config-input/touchpaddevice.cpp 
b/lxqt-config-input/touchpaddevice.cpp
+index 31adbe5f..41690c2c 100644
+--- a/lxqt-config-input/touchpaddevice.cpp
 b/lxqt-config-input/touchpaddevice.cpp
+@@ -21,6 +21,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild 
b/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild
index 263309fa6e7..da4ec98c1f4 100644
--- a/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild
@@ -20,6 +20,8 @@ LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2"
 SLOT="0"
 IUSE="+monitor +touchpad"
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.14-build.patch" )
+
 BDEPEND="
dev-qt/linguist-tools:5
>=dev-util/lxqt-build-tools-0.6.0

[gentoo-commits] repo/gentoo:master commit in: lxqt-base/lxqt-config/files/, lxqt-base/lxqt-config/

2018-08-11 Thread Jonathan Scruggs 
commit: 2da39a98096bae76422ceec565aa820d2a0b26a6
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Wed Jul 11 15:13:48 2018 +
Commit: Jonathan Scruggs  gentoo  org>
CommitDate: Sat Aug 11 10:09:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2da39a98

lxqt-base/lxqt-config: version update to 0.13.0

Added patch from Alec Moskvin  gmx.com> to remove the Qt5Concurrent
dependency.

 lxqt-base/lxqt-config/Manifest |  1 +
 ...-0.13.0-remove-dependency-on-QtConcurrent.patch | 34 +++
 lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild| 67 ++
 lxqt-base/lxqt-config/metadata.xml | 14 +++--
 4 files changed, 112 insertions(+), 4 deletions(-)

diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest
index b108d389704..92874a4ea7e 100644
--- a/lxqt-base/lxqt-config/Manifest
+++ b/lxqt-base/lxqt-config/Manifest
@@ -1 +1,2 @@
 DIST lxqt-config-0.11.0.tar.xz 197112 BLAKE2B 
2b7da999a61922b4a54e7dd6481c54e4e98262340d596f334058ea8e2d235baff96b39a27ddacadf6678a6f283a7ac63d7160747c31e2bb395036a3657b71030
 SHA512 
20a573ba6cb83ef19b58a31180924e527496f4eb5d5f9bcf1eb37e3883b8b46ea02f08be9fe42a06f12508ffa2a9af5225d3fe00856ee7807704a99adf654795
+DIST lxqt-config-0.13.0.tar.xz 201112 BLAKE2B 
6a79c1f07e1cf055da09bb7dd8f7da2426891770b0e757ba3c4e5ef137f715ba3a579b2c05a4f1938c9d76b6dda0643119888be7dace2083a57a7dfe0df93aa5
 SHA512 
a5102794c4cf18a18e633cbc7d0b89653abf2612bc61e506ec169f4898903092f5201a09a2610642c641a17b59a992a6d6f59366ec61d54763e8b911d5220ca9

diff --git 
a/lxqt-base/lxqt-config/files/lxqt-config-0.13.0-remove-dependency-on-QtConcurrent.patch
 
b/lxqt-base/lxqt-config/files/lxqt-config-0.13.0-remove-dependency-on-QtConcurrent.patch
new file mode 100644
index 000..39bf078ae13
--- /dev/null
+++ 
b/lxqt-base/lxqt-config/files/lxqt-config-0.13.0-remove-dependency-on-QtConcurrent.patch
@@ -0,0 +1,34 @@
+From e49e5ebabbf8bbe30d4955bc6cb785303f94c6f6 Mon Sep 17 00:00:00 2001
+From: Alec Moskvin 
+Date: Sun, 15 Jul 2018 11:26:16 -0400
+Subject: [PATCH] Remove dependency on QtConcurrent
+
+---
+ CMakeLists.txt   | 1 -
+ lxqt-config-file-associations/CMakeLists.txt | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9c42ddc..5fb2548 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -22,7 +22,6 @@ set(CMAKE_AUTORCC ON)
+ find_package(Qt5Widgets REQUIRED)
+ find_package(Qt5DBus REQUIRED)
+ find_package(Qt5Xml REQUIRED)
+-find_package(Qt5Concurrent REQUIRED)
+ find_package(Qt5X11Extras REQUIRED)
+ find_package(Qt5LinguistTools REQUIRED)
+ find_package(lxqt REQUIRED)
+diff --git a/lxqt-config-file-associations/CMakeLists.txt 
b/lxqt-config-file-associations/CMakeLists.txt
+index 0506723..2500cf3 100644
+--- a/lxqt-config-file-associations/CMakeLists.txt
 b/lxqt-config-file-associations/CMakeLists.txt
+@@ -61,7 +61,6 @@ target_link_libraries(${PROJECT_NAME}
+ Qt5::Xml
+ Qt5::DBus
+ Qt5::Widgets
+-Qt5::Concurrent
+ ${LIBRARIES}
+ )
+ 

diff --git a/lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild 
b/lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild
new file mode 100644
index 000..d3af64823fc
--- /dev/null
+++ b/lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils eapi7-ver
+
+DESCRIPTION="LXQt system configuration control center"
+HOMEPAGE="https://lxqt.org/;
+
+if [[ ${PV} = ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/lxqt/${PN}.git;
+else
+   SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz;
+   KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2"
+SLOT="0"
+IUSE="+monitor"
+
+RDEPEND="
+   >=dev-libs/libqtxdg-3.0.0
+   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
+   =lxqt-base/liblxqt-$(ver_cut 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= )
+"
+DEPEND="${DEPEND}
+   dev-qt/linguist-tools:5
+   >=dev-util/lxqt-build-tools-0.5.0
+"
+
+PATCHES=( "${FILESDIR}/${P}-remove-dependency-on-QtConcurrent.patch" )
+
+src_configure() {
+   local mycmakeargs=(
+   -DPULL_TRANSLATIONS=OFF
+   -DWITH_MONITOR="$(usex monitor)"
+   )
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+   doman man/*.1 liblxqt-config-cursor/man/*.1 
lxqt-config-appearance/man/*.1
+}
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+

[gentoo-commits] repo/gentoo:master commit in: lxqt-base/lxqt-config/files/, lxqt-base/lxqt-config/

2017-06-03 Thread Michael Palimaka 
commit: e2f83d73f5912804606cc55a49cbb645c41b2284
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Jun  3 13:03:33 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Jun  3 13:03:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2f83d73

lxqt-base/lxqt-config: backport patch from upstream solving build failure with 
cmake-3.8

Gentoo-bug: 616324
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../files/lxqt-config-0.11.0-cmake-3.8.patch   | 221 +
 lxqt-base/lxqt-config/lxqt-config-0.11.0.ebuild|   4 +-
 2 files changed, 224 insertions(+), 1 deletion(-)

diff --git a/lxqt-base/lxqt-config/files/lxqt-config-0.11.0-cmake-3.8.patch 
b/lxqt-base/lxqt-config/files/lxqt-config-0.11.0-cmake-3.8.patch
new file mode 100644
index 000..8088225e30d
--- /dev/null
+++ b/lxqt-base/lxqt-config/files/lxqt-config-0.11.0-cmake-3.8.patch
@@ -0,0 +1,221 @@
+From bca652a75f8a497a69b1fbc1c7eaa353f6b4eef8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lu=C3=ADs=20Pereira?= 
+Date: Wed, 19 Apr 2017 12:56:45 +0100
+Subject: [PATCH] Fixes a FTBFS with CMake v3.8
+
+CMake v3.8 AUTOUIC changed the directory where the file is generated to:
+/_autogen/include. The changes makes
+us fail.
+The change is actually just an sympton and not a root cause. We shouldn't
+include a ui generated file in public header.
+
+Closes https://github.com/lxde/lxqt/issues/1277
+---
+ liblxqt-config-cursor/selectwnd.cpp | 64 -
+ liblxqt-config-cursor/selectwnd.h   |  9 --
+ 2 files changed, 41 insertions(+), 32 deletions(-)
+
+diff --git a/liblxqt-config-cursor/selectwnd.cpp 
b/liblxqt-config-cursor/selectwnd.cpp
+index e76840b..8a1fa18 100644
+--- a/liblxqt-config-cursor/selectwnd.cpp
 b/liblxqt-config-cursor/selectwnd.cpp
+@@ -13,6 +13,7 @@
+ #include 
+ 
+ #include "selectwnd.h"
++#include "ui_selectwnd.h"
+ 
+ #include 
+ #include 
+@@ -37,22 +38,24 @@
+ 
+ #define HOME_ICON_DIR QDir::homePath() + "/.icons"
+ 
+-SelectWnd::SelectWnd(LXQt::Settings* settings, QWidget *parent) : 
QWidget(parent), mSettings(settings)
++SelectWnd::SelectWnd(LXQt::Settings* settings, QWidget *parent)
++: QWidget(parent),
++  mSettings(settings),
++  ui(new Ui::SelectWnd)
+ {
+-setupUi(this);
+-
+-warningLabel->hide();
++ui->setupUi(this);
++ui->warningLabel->hide();
+ 
+ mModel = new XCursorThemeModel(this);
+ 
+ int size = style()->pixelMetric(QStyle::PM_LargeIconSize);
+-lbThemes->setModel(mModel);
+-lbThemes->setItemDelegate(new ItemDelegate(this));
+-lbThemes->setIconSize(QSize(size, size));
+-lbThemes->setSelectionMode(QAbstractItemView::SingleSelection);
++ui->lbThemes->setModel(mModel);
++ui->lbThemes->setItemDelegate(new ItemDelegate(this));
++ui->lbThemes->setIconSize(QSize(size, size));
++ui->lbThemes->setSelectionMode(QAbstractItemView::SingleSelection);
+ 
+ // Make sure we find out about selection changes
+-connect(lbThemes->selectionModel(), SIGNAL(currentChanged(const 
QModelIndex &, const QModelIndex &)),
++connect(ui->lbThemes->selectionModel(), SIGNAL(currentChanged(const 
QModelIndex &, const QModelIndex &)),
+ SLOT(currentChanged(const QModelIndex &, const QModelIndex &)));
+ // display/hide warning label
+ connect(mModel, SIGNAL(modelReset()),
+@@ -62,15 +65,15 @@ SelectWnd::SelectWnd(LXQt::Settings* settings, QWidget 
*parent) : QWidget(parent
+ connect(mModel, SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
+ this, SLOT(handleWarning()));
+ 
+-connect(warningLabel, SIGNAL(showDirInfo()),
++connect(ui->warningLabel, SIGNAL(showDirInfo()),
+ this, SLOT(showDirInfo()));
+ 
+ // Disable the install button if we can't install new themes to ~/.icons,
+ // or Xcursor isn't set up to look for cursor themes there
+-btInstall->setEnabled(mModel->searchPaths().contains(HOME_ICON_DIR) && 
iconsIsWritable());
++ui->btInstall->setEnabled(mModel->searchPaths().contains(HOME_ICON_DIR) 
&& iconsIsWritable());
+ // TODO/FIXME: btInstall functionality
+-btInstall->hide();
+-btRemove->hide();
++ui->btInstall->hide();
++ui->btRemove->hide();
+ 
+ //QTimer::singleShot(0, this, SLOT(setCurrent()));
+ 
+@@ -80,11 +83,12 @@ SelectWnd::SelectWnd(LXQt::Settings* settings, QWidget 
*parent) : QWidget(parent
+ 
+ SelectWnd::~SelectWnd()
+ {
++delete ui;
+ }
+ 
+ void SelectWnd::setCurrent()
+ {
+-lbThemes->selectionModel()->clear();
++ui->lbThemes->selectionModel()->clear();
+ 
+ QString ct = getCurrentTheme();
+ mAppliedIndex = mModel->defaultIndex();
+@@ -97,9 +101,9 @@ void SelectWnd::setCurrent()
+ const XCursorThemeData *theme = mModel->theme(mAppliedIndex);
+ // Select the current theme
+ selectRow(mAppliedIndex);
+-lbThemes->scrollTo(mAppliedIndex,