gentoo resync : 22.10.2018

4 files changed, 3 insertions, 283 deletions

diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest
index b5520a4e623b..5aaf86d8b4e6 100644
--- a/lxqt-base/lxqt-config/Manifest
+++ b/lxqt-base/lxqt-config/Manifest
@@ -1,7 +1,4 @@
-AUX lxqt-config-0.11.0-cmake-3.8.patch 8137 BLAKE2B 1864b7f2dfe50ff2d9bd0fbcf7b17b11fa997f45843510f5bed8b942e1121cecb4abbf7cf18bb6f986825cdf527d3cad8407df7237621e54e57adddd48496a99 SHA512 4283f50dec924245329a47800987e355d5df8ee17db0f2394ca313faed4bb5e45e6c891619b9d81b55a2d0b083119d49dc4d06cbfe5bab17821a9702fa0d438f
 AUX lxqt-config-0.13.0-remove-dependency-on-QtConcurrent.patch 1122 BLAKE2B cca7503b2c68300ad1232b7688ceb367801e9454c80d5c2af4a9385d4807b0beedb6ef0b8aa57768d928d420b0d668c22a661971115c93fccf7bb72e4d563407 SHA512 4cdd61471c47e79794054ee58573dd7346e5f88fb869458f8e828d7c1f01af4d73a5d0648b6ad79382bba140ed731c7604f86851f85afa614a1c19cf5a366792
-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
-EBUILD lxqt-config-0.11.0.ebuild 1217 BLAKE2B 522f4d4fa54edfb5a4f722efde8b16ba8241070d0725470258410b3b4a086e9de959e67510edff9b192a95428bad3787352e17f22a453ff47d21ef39ae92a83c SHA512 7eed21696eac43fe63c66cba409bcafbdc33117d940dc6200b976013eb9b51c7022ad45259b75a5ffefa3ba2301950d797d35f202f9c1db35c27cf453063c45d
-EBUILD lxqt-config-0.13.0.ebuild 1410 BLAKE2B 91c909bd782e4c191ac1b923e29229371eb74c7420a4dacad36554328948a03bd91421785fa98e3a3e0ca2bd1582d2fa8c7f61b3e5b6e7603ec8544012e3e57d SHA512 1859e1ab9e1e08d70a5592681a431b7e2134801368734c88eb44ea85bc212678e0df4eb51dc9de68baa345260a3cd2b6ec48a9aaa88ebfd4797b4f3496326ad1
+EBUILD lxqt-config-0.13.0.ebuild 1405 BLAKE2B 0e3701718b5b3812bfda4903ddb47011004cf87862997c6adbb43544b4e8f398177fe9c8661ea61fd85197cceb8e2623047a065767c046274a03d358dda3c433 SHA512 c4032c1a2b7f77769bece058a53b6c0010e744d87192c3f7d01cd4b6b941ccf1889559c372c493255f690ede8629a7c6b90fa90b4fc214fe35a2ff95ec435158
 MISC metadata.xml 435 BLAKE2B f2ac19945e50b82b13706f0fc3790e547243f4a30b2abde7f2b333fd29590dee96d3dc2680380d3db905cc26d93273d36529310c4e68a892163b9a5fc1c87e72 SHA512 2d345ec5a53c4293f632ac65ce0f45f4604914a019f31536de00039dd523f95b23ba830b3c783ef1cfff3f7343e7eb343b4501d001fb3322a50f998394556222
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
deleted file mode 100644
index 8088225e30df..000000000000
--- a/lxqt-base/lxqt-config/files/lxqt-config-0.11.0-cmake-3.8.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From bca652a75f8a497a69b1fbc1c7eaa353f6b4eef8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lu=C3=ADs=20Pereira?= <luis.artur.pereira@gmail.com>
-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:
-<CMAKE_CURRENT_BINARY_DIR>/<TARGETNAME>_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 <QDebug>
- 
- #include "selectwnd.h"
-+#include "ui_selectwnd.h"
- 
- #include <QKeyEvent>
- #include <QMessageBox>
-@@ -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, QListView::PositionAtCenter);
-+        ui->lbThemes->scrollTo(mAppliedIndex, QListView::PositionAtCenter);
-         // Update the preview widget as well
--        if (theme) preview->setTheme(*theme);// else preview->clearTheme();
-+        if (theme) ui->preview->setTheme(*theme);// else ui->preview->clearTheme();
-     }
- }
- 
-@@ -123,8 +127,8 @@ void SelectWnd::selectRow(int row) const
-     QModelIndex from = mModel->index(row, 0);
-     QModelIndex to = mModel->index(row, mModel->columnCount()-1);
-     QItemSelection selection(from, to);
--    lbThemes->selectionModel()->select(selection, QItemSelectionModel::Select);
--    lbThemes->selectionModel()->setCurrentIndex(mAppliedIndex, QItemSelectionModel::NoUpdate);
-+    ui->lbThemes->selectionModel()->select(selection, QItemSelectionModel::Select);
-+    ui->lbThemes->selectionModel()->setCurrentIndex(mAppliedIndex, QItemSelectionModel::NoUpdate);
- }
- 
- void SelectWnd::currentChanged(const QModelIndex &current, const QModelIndex &previous)
-@@ -133,16 +137,16 @@ void SelectWnd::currentChanged(const QModelIndex &current, const QModelIndex &pr
-     if (current.isValid()) {
-         const XCursorThemeData *theme = mModel->theme(current);
-         if (theme) {
--            preview->setTheme(*theme);
--            btRemove->setEnabled(theme->isWritable());
-+            ui->preview->setTheme(*theme);
-+            ui->btRemove->setEnabled(theme->isWritable());
-         } else {
--            preview->clearTheme();
-+            ui->preview->clearTheme();
-         }
- 
-         // directly apply the current settings
-         applyCurrent();
-     } else {
--        preview->clearTheme();
-+        ui->preview->clearTheme();
-     }
-    //emit changed(mAppliedIndex != current);
- }
-@@ -155,7 +159,7 @@ void SelectWnd::on_btInstall_clicked()
- void SelectWnd::applyCurrent()
- {
-     //qDebug() << "'set' clicked";
--    const XCursorThemeData *theme = mModel->theme(lbThemes->currentIndex());
-+    const XCursorThemeData *theme = mModel->theme(ui->lbThemes->currentIndex());
-     if (!theme) return;
-     applyTheme(*theme);
-     fixXDefaults(theme->name());
-@@ -200,7 +204,7 @@ void SelectWnd::applyCurrent()
- void SelectWnd::on_btRemove_clicked()
- {
-     qDebug() << "'remove' clicked";
--    const XCursorThemeData *theme = mModel->theme(lbThemes->currentIndex());
-+    const XCursorThemeData *theme = mModel->theme(ui->lbThemes->currentIndex());
-     if (!theme) return;
-     QString ct = getCurrentTheme();
-     if (ct == theme->name())
-@@ -210,20 +214,20 @@ void SelectWnd::on_btRemove_clicked()
-         return;
-     }
-     QDir d(theme->path());
--    preview->clearTheme();
--    mModel->removeTheme(lbThemes->currentIndex());
-+    ui->preview->clearTheme();
-+    mModel->removeTheme(ui->lbThemes->currentIndex());
-     removeXCursorTheme(d);
- }
- 
- void SelectWnd::handleWarning()
- {
-         bool empty = mModel->rowCount();
--        warningLabel->setVisible(!empty);
--        preview->setVisible(empty);
--        infoLabel->setVisible(empty);
-+        ui->warningLabel->setVisible(!empty);
-+        ui->preview->setVisible(empty);
-+        ui->infoLabel->setVisible(empty);
- }
- 
- void SelectWnd::showDirInfo()
- {
--        QToolTip::showText(mapToGlobal(warningLabel->buttonPos()), mModel->searchPaths().join("\n"));
-+        QToolTip::showText(mapToGlobal(ui->warningLabel->buttonPos()), mModel->searchPaths().join("\n"));
- }
-diff --git a/liblxqt-config-cursor/selectwnd.h b/liblxqt-config-cursor/selectwnd.h
-index c9bc428..200cfa0 100644
---- a/liblxqt-config-cursor/selectwnd.h
-+++ b/liblxqt-config-cursor/selectwnd.h
-@@ -15,16 +15,20 @@
- 
- #include <QObject>
- #include <QWidget>
-+#include <QPersistentModelIndex>
- #include <lxqtglobals.h>
- 
- namespace LXQt {
-   class Settings;
- }
- 
-+namespace Ui {
-+class SelectWnd;
-+}
-+
- class XCursorThemeModel;
- 
--#include "ui_selectwnd.h"
--class LXQT_API SelectWnd : public QWidget, private Ui_SelectWnd
-+class LXQT_API SelectWnd : public QWidget
- {
-     Q_OBJECT
- 
-@@ -55,6 +59,7 @@ private slots:
-     XCursorThemeModel *mModel;
-     QPersistentModelIndex mAppliedIndex;
-     LXQt::Settings* mSettings;
-+    Ui::SelectWnd *ui;
- };
- 
- #endif
diff --git a/lxqt-base/lxqt-config/lxqt-config-0.11.0.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.11.0.ebuild
deleted file mode 100644
index 406d90f0f729..000000000000
--- a/lxqt-base/lxqt-config/lxqt-config-0.11.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 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="https://lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-
-CDEPEND="
-	>=dev-libs/libqtxdg-1.0.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"
-
-PATCHES=( "${FILESDIR}/${P}-cmake-3.8.patch" )
-
-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.13.0.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild
index d3af64823fcc..045498386add 100644
--- a/lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	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"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2"