diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2018-10-16 15:04:34 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-10-17 16:40:46 +0200 |
commit | 06a16e24a6509e7dbf304b904e2adc61546c783a (patch) | |
tree | 9ef0714e9a4176fb9ea1ff242183a6a7cdd88439 | |
parent | net-fs/samba-4.7.10-r0: add ~alpha keyword (diff) | |
download | gentoo-06a16e24a6509e7dbf304b904e2adc61546c783a.tar.gz gentoo-06a16e24a6509e7dbf304b904e2adc61546c783a.tar.bz2 gentoo-06a16e24a6509e7dbf304b904e2adc61546c783a.zip |
lxqt-base: Drop LXQt 0.11.1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
39 files changed, 10 insertions, 1086 deletions
diff --git a/lxqt-base/liblxqt/Manifest b/lxqt-base/liblxqt/Manifest index 82c994b0ee02..364a4217f932 100644 --- a/lxqt-base/liblxqt/Manifest +++ b/lxqt-base/liblxqt/Manifest @@ -1,2 +1 @@ -DIST liblxqt-0.11.0.tar.xz 58912 BLAKE2B 1ee7064f3fe9de78890761744655c8d11834439535d64b07fec9709db955d9e70b574dbe437d1f1afa65bf7b008cb1473b99c1eda19840efa4bfae3d43fb13ab SHA512 df2aaba0c0b723975c65a063ef3c6564a60d1ac8662da443e1ff9030b1dd61bc264916e5efac272895048f7219a5cb5413e98aa12c5340b547413ad686f2c9ed DIST liblxqt-0.13.0.tar.xz 56896 BLAKE2B aa642fc87991c1768e391908e6444af456cca073223e4f05a2ff95eb7a04a4ab5d4c7d217424ab8d096531095d2dc767be7341b8336410ab46ce6d2e8676c686 SHA512 17d6ab8aa7475e1d2ca90b9c3d8b0a438003f740fa878b09937e0214f0139b6f69eb833e7179e981260ae67079fd70c19423d1a4948a2a18061539fb2191e9ad diff --git a/lxqt-base/liblxqt/liblxqt-0.11.0-r1.ebuild b/lxqt-base/liblxqt/liblxqt-0.11.0-r1.ebuild deleted file mode 100644 index 1f4a33b9f2e7..000000000000 --- a/lxqt-base/liblxqt/liblxqt-0.11.0-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils - -DESCRIPTION="Common base library for the LXQt desktop environment" -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" - -RDEPEND=">=dev-libs/libqtxdg-1.3.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[X] - x11-libs/libXScrnSaver" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - tc-is-gcc && [[ $(gcc-version) < 4.8 ]] && \ - die 'The active compiler needs to be gcc 4.8 (or newer)' - fi -} - -src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) - cmake-utils_src_configure -} diff --git a/lxqt-base/libsysstat/Manifest b/lxqt-base/libsysstat/Manifest index afb93549c5d3..00d994092187 100644 --- a/lxqt-base/libsysstat/Manifest +++ b/lxqt-base/libsysstat/Manifest @@ -1,3 +1 @@ -DIST libsysstat-0.3.1.tar.xz 18884 BLAKE2B 3fd26ef8c1b36e9e5fccd722de57d5cd2349f9579aec4fa868838e09719d16483fc92fa6a2c37b38eb83b018af8c8030f95bda35b0c3073588497a2e978c851f SHA512 00413afc6363c38a0c15f5f617c47600711f06d072bc312d5e301f4bb9a8f42effa66f1fb600a4e6147ed30b48c32bee0e3879bbe411c12bef9cc8eaa20f566d -DIST libsysstat-0.3.2.tar.xz 20344 BLAKE2B 5f3e33291328cb39682a878a158403f7ce4490d55f444b684202155f9af25265a457fa10308d4553a61b8b424beab1974a4911fecff90b4e65cea1715c1d43e1 SHA512 6676f2670b09c1f94f4d17385016e119ce69345377a31d80d4c0b65a0c9d79993ae4d80e6801c5ea40b47ce813530a2819a278243f3c350335bfddb3593befcb DIST libsysstat-0.4.1.tar.xz 17304 BLAKE2B 0074ef15eaa9feddaa20123bcd39f0b5da2bd9a968a22d2c1c6465fccefe81f5c01e323657c4e8c637704e8bbe77ccf561cf1322853110e378fe2f03d16deea1 SHA512 e0f6497be9a7205b6053cdae0fcd88d8b4723489ca97f1ed2cf6704cae149abc3f3339c777aca638abb054e171c6e592b5a10c129aff0a1f42083bd91ab11eb5 diff --git a/lxqt-base/libsysstat/libsysstat-0.3.1.ebuild b/lxqt-base/libsysstat/libsysstat-0.3.1.ebuild deleted file mode 100644 index 99bf9e6e279f..000000000000 --- a/lxqt-base/libsysstat/libsysstat-0.3.1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit cmake-utils - -DESCRIPTION="A Qt-based interface to system statistics" -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" - -RDEPEND=" - dev-qt/qtcore:5 -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 -" diff --git a/lxqt-base/libsysstat/libsysstat-0.3.2.ebuild b/lxqt-base/libsysstat/libsysstat-0.3.2.ebuild deleted file mode 100644 index 94f2c4c2459f..000000000000 --- a/lxqt-base/libsysstat/libsysstat-0.3.2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit cmake-utils - -DESCRIPTION="A Qt-based interface to system statistics" -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="LGPL-2.1+" -SLOT="0" - -RDEPEND=" - dev-qt/qtcore:5 -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 -" diff --git a/lxqt-base/lxqt-about/Manifest b/lxqt-base/lxqt-about/Manifest index 477084d18a14..73dbb7583c32 100644 --- a/lxqt-base/lxqt-about/Manifest +++ b/lxqt-base/lxqt-about/Manifest @@ -1,2 +1 @@ -DIST lxqt-about-0.11.0.tar.xz 21856 BLAKE2B 9904d474e3daa22169fee9b3f6e773f7bb6141d76ff62afd94971d01746d3f8036211ab0713d496479f55368932f0edb60c87e52a4398204755980c7a90adaab SHA512 53d818e036275075f41edef7af4615e5dbdb651cade68a6f502cbea6f75d32d368111536a3987078d3f682187cd6c420d8af827cc8fafa48d247ef4af5e0febf DIST lxqt-about-0.13.0.tar.xz 22580 BLAKE2B 9368376520c1fab67ee6e23af4a020de42976a9fb703adb7c53c5c6d2f83075db618c837692df18d5fec2c9d68c313f01cf59c4dfa609a6ad180d56589cee8df SHA512 5ba1106a66115f791597b12173be5b8f340c275e21ee53acd77aa7f10c409ad9b0bb83e24479fba6ff4265e6261ba90dde98ce10331b00fc01e87196fa506214 diff --git a/lxqt-base/lxqt-about/lxqt-about-0.11.0.ebuild b/lxqt-base/lxqt-about/lxqt-about-0.11.0.ebuild deleted file mode 100644 index ca73cfe81884..000000000000 --- a/lxqt-base/lxqt-about/lxqt-about-0.11.0.ebuild +++ /dev/null @@ -1,35 +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 about dialog" -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="LGPL-2.1+" -SLOT="0" - -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - ~lxqt-base/liblxqt-${PV} -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) - cmake-utils_src_configure -} diff --git a/lxqt-base/lxqt-admin/Manifest b/lxqt-base/lxqt-admin/Manifest index de880144f2cb..1a2a8adbef65 100644 --- a/lxqt-base/lxqt-admin/Manifest +++ b/lxqt-base/lxqt-admin/Manifest @@ -1,2 +1 @@ -DIST lxqt-admin-0.11.0.tar.xz 114720 BLAKE2B 12d660ba616aaea5e96525ea0acc47b36f1285b36fd42b2aa4c79d22c40a7d27dfb190e6cc316d3424815b29a4019b2afac1507b3c7c416984ab98a75a869349 SHA512 cbbd83892c0c181eb996de198f6c5d3b00d0c6a5e185b816ac1237bd5930da0aa8cd272696571bb91d70054e89ea96f4dd9b3aa34dff7534286ff3e529757792 DIST lxqt-admin-0.13.0.tar.xz 116436 BLAKE2B 9395ea5f762da37ebb810c167c66c069b15b86b6b71e4a679d6923a0deedd9a87da65469b3ad5c934f9898e91776eee7ec7a248996283201287d00459f69e5c0 SHA512 fc84f2cffd28ea87833194b36654016d426c3b0e7a468468568f35153b208129d504200b31c17516298444882bc54ad7e3bc1cbef2b67459515eaac3dc77dea7 diff --git a/lxqt-base/lxqt-admin/lxqt-admin-0.11.0.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-0.11.0.ebuild deleted file mode 100644 index f0b2edaac4b4..000000000000 --- a/lxqt-base/lxqt-admin/lxqt-admin-0.11.0.ebuild +++ /dev/null @@ -1,38 +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 administration tool" -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="LGPL-2.1+" -SLOT="0" - -DEPEND="dev-libs/glib:2 - >=dev-libs/libqtxdg-1.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 - ~lxqt-base/liblxqt-${PV} - kde-frameworks/kwindowsystem:5 - x11-libs/libX11 -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) - cmake-utils_src_configure -} diff --git a/lxqt-base/lxqt-common/Manifest b/lxqt-base/lxqt-common/Manifest deleted file mode 100644 index a532ff2d77d5..000000000000 --- a/lxqt-base/lxqt-common/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST lxqt-common-0.11.0.tar.xz 3216520 BLAKE2B 217554dc5b16f3bbc03535440c34191e7ccb85384c63ad13911a6a21ba812b5f93dcd308e3bac7d7bb6b4cda74394069257d589e27261c0c62eaba9dc68fa199 SHA512 5eeaa6ead263a93b58ab9ec536c287fe383b5abade722dd3c7232840bc12c56e2208904bfbbc5ee9092c340d14d939a2ac0dcd37cf2175a0f601bbe050f00a2c diff --git a/lxqt-base/lxqt-common/lxqt-common-0.11.0.ebuild b/lxqt-base/lxqt-common/lxqt-common-0.11.0.ebuild deleted file mode 100644 index f2d3b2d66aa3..000000000000 --- a/lxqt-base/lxqt-common/lxqt-common-0.11.0.ebuild +++ /dev/null @@ -1,34 +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 common resources" -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="LGPL-2.1+" -SLOT="0" - -DEPEND=">=lxqt-base/liblxqt-0.11.0" -RDEPEND="${DEPEND}" -PDEPEND=">=lxqt-base/lxqt-session-0.11.0" - -src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - dodir "/etc/X11/Sessions" - dosym "/usr/bin/startlxqt" "/etc/X11/Sessions/lxqt" -} diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest index 92874a4ea7ea..cf057c2d3154 100644 --- a/lxqt-base/lxqt-config/Manifest +++ b/lxqt-base/lxqt-config/Manifest @@ -1,2 +1 @@ -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.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 ¤t, const QModelIndex &previous) -@@ -133,16 +137,16 @@ void SelectWnd::currentChanged(const QModelIndex ¤t, 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-globalkeys/Manifest b/lxqt-base/lxqt-globalkeys/Manifest index 8d69e9692b48..578c26277991 100644 --- a/lxqt-base/lxqt-globalkeys/Manifest +++ b/lxqt-base/lxqt-globalkeys/Manifest @@ -1,2 +1 @@ -DIST lxqt-globalkeys-0.11.0.tar.xz 50480 BLAKE2B 65a4c3039389fab0a2039637317b04c5bb32642e63dae6dfac1a2e445739ec532e730a7f944eb18066d45196ca650fbbff0a5f0d221e1298ad5e3fc3b3e82325 SHA512 165c22d60a0d21cf25e36429be5ef0daab86329b0c10a1be67cf90cda817ebc409c0ac7c383ff10c51e4dd8194e799af8af9b3affd74dea49dcc93d05fb6cb33 DIST lxqt-globalkeys-0.13.0.tar.xz 53128 BLAKE2B 91a61ac4964fd3d883213038e7544fdb3cf02ebbca2f3a42936123b40b11934bbcb31e14b755910bc1b076fdd2b69d6d78778b8e2aff4e4a1635d5393ef96c70 SHA512 5350e91a03fa6928ecefb935302fe87bfa38e6f61bea564222739f4f2896ffab85304d7c0afe6dbfc78912e944c25f32892f35bfb08a904395fda24b9d58b3ad diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.11.0.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.11.0.ebuild deleted file mode 100644 index 4322d843551d..000000000000 --- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.11.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit cmake-utils - -DESCRIPTION="Daemon and library for global keyboard shortcuts registration" -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" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - ~lxqt-base/liblxqt-${PV} - >=dev-libs/libqtxdg-1.0.0 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 -" - -src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) - cmake-utils_src_configure -} diff --git a/lxqt-base/lxqt-l10n/Manifest b/lxqt-base/lxqt-l10n/Manifest index 1895a17ebe91..f06f5bc0e6db 100644 --- a/lxqt-base/lxqt-l10n/Manifest +++ b/lxqt-base/lxqt-l10n/Manifest @@ -1,2 +1 @@ -DIST lxqt-l10n-0.11.0.tar.xz 513704 BLAKE2B f300b938db282151df1552e13e5530ffab1465d496e89df73b5d339b339442c018521d2eb1d5c3d7a942607596ba8ab98dacd689ba74761ec93e82b42ba85249 SHA512 827a38184d27684ab98234df671c48c8ff7d45bfe4fafafe82fd821786e856eaadade98f8d244cac9729dd0ec1a2d8d295b04397bed4a3375cac8191759ec27e DIST lxqt-l10n-0.13.0.tar.xz 758588 BLAKE2B e904f60c50dd389fce027a374536412b9f2947bc4a7b81c313a0457744328158215b520e15044c30c045a022c7119682b05ccbf2534923684cf5daf40d5f7c45 SHA512 cbafc0f1c12a9c14af8ed896f5147d90fcd24786be0cc5de7f8897e31ac012a7308604622635f43709edeb13824395806e6d8e89355a0fd6799227f8d0d8f686 diff --git a/lxqt-base/lxqt-l10n/lxqt-l10n-0.11.0.ebuild b/lxqt-base/lxqt-l10n/lxqt-l10n-0.11.0.ebuild deleted file mode 100644 index 27fa16aa85d5..000000000000 --- a/lxqt-base/lxqt-l10n/lxqt-l10n-0.11.0.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils - -DESCRIPTION="LXQt localisation package" -HOMEPAGE="https://lxqt.org" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://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="LGPL-2.1+" -SLOT="0" - -DEPEND=" - dev-qt/linguist-tools:5 - ~lxqt-base/liblxqt-${PV} -" diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.11.0.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.11.0.ebuild deleted file mode 100644 index f1654fe9f48a..000000000000 --- a/lxqt-base/lxqt-meta/lxqt-meta-0.11.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment" -HOMEPAGE="https://lxqt.org" - -LICENSE="metapackage" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="+about admin +filemanager +icons lightdm lximage minimal +oxygen +policykit - powermanagement sddm ssh-askpass sudo" -REQUIRED_USE="oxygen? ( icons )" - -RDEPEND=" - >=lxde-base/lxmenu-data-0.1.2 - ~lxqt-base/lxqt-common-${PV} - ~lxqt-base/lxqt-config-${PV} - ~lxqt-base/lxqt-globalkeys-${PV} - ~lxqt-base/lxqt-notificationd-${PV} - ~lxqt-base/lxqt-panel-${PV} - ~lxqt-base/lxqt-qtplugin-${PV} - ~lxqt-base/lxqt-runner-${PV} - ~lxqt-base/lxqt-session-${PV} - virtual/ttf-fonts - about? ( ~lxqt-base/lxqt-about-${PV} ) - admin? ( ~lxqt-base/lxqt-admin-${PV} ) - filemanager? ( >=x11-misc/pcmanfm-qt-${PV} ) - icons? ( oxygen? ( kde-frameworks/oxygen-icons ) - !oxygen? ( virtual/freedesktop-icon-theme ) ) - lightdm? ( x11-misc/lightdm ) - lximage? ( media-gfx/lximage-qt ) - !minimal? ( x11-wm/openbox - x11-misc/obconf-qt ) - policykit? ( ~lxqt-base/lxqt-policykit-${PV} - || ( sys-auth/consolekit[policykit(-)] - sys-apps/systemd[policykit(-)] ) ) - powermanagement? ( ~lxqt-base/lxqt-powermanagement-${PV} ) - sddm? ( >=x11-misc/sddm-0.11.0 ) - ssh-askpass? ( ~lxqt-base/lxqt-openssh-askpass-${PV} ) - sudo? ( ~lxqt-base/lxqt-sudo-${PV} )" - -# 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) - -S="${WORKDIR}" diff --git a/lxqt-base/lxqt-meta/metadata.xml b/lxqt-base/lxqt-meta/metadata.xml index e7895d12a9f3..c68821c7a25d 100644 --- a/lxqt-base/lxqt-meta/metadata.xml +++ b/lxqt-base/lxqt-meta/metadata.xml @@ -8,28 +8,16 @@ <use> <flag name="about">Install <pkg>lxqt-base/lxqt-about</pkg></flag> <flag name="admin">Install <pkg>lxqt-base/lxqt-admin</pkg></flag> - <flag name="filemanager">Install <pkg>x11-misc/pcmanfm-qt</pkg> - file manager</flag> - <flag name="icons">Install an icon theme</flag> - <flag name="lightdm">Install <pkg>x11-misc/lightdm</pkg> - display manager</flag> - <flag name="lximage">Install <pkg>media-gfx/lximage-qt</pkg> - image viewer</flag> - <flag name="minimal">Do not install <pkg>x11-wm/openbox</pkg> - window manager</flag> - <flag name="oxygen">Prefer <pkg>kde-frameworks/oxygen-icons</pkg> (default)</flag> - <flag name="powermanagement" restrict=">=lxqt-base/lxqt-meta-0.13.0">Install - <pkg>lxqt-base/lxqt-powermanagement</pkg> package</flag> - <flag name="processviewer">Install - <pkg>x11-misc/qps</pkg> package</flag> - <flag name="screenshot" restrict=">=lxqt-base/lxqt-meta-0.13.0">Install - <pkg>x11-misc/screengrab</pkg> package</flag> - <flag name="sddm">Install <pkg>x11-misc/sddm</pkg> - display manager</flag> - <flag name="ssh-askpass">Install <pkg>lxqt-base/lxqt-openssh-askpass</pkg> - user password prompt tool</flag> + <flag name="filemanager">Install <pkg>x11-misc/pcmanfm-qt</pkg>file manager</flag> + <flag name="lightdm">Install <pkg>x11-misc/lightdm</pkg>display manager</flag> + <flag name="lximage">Install <pkg>media-gfx/lximage-qt</pkg>image viewer</flag> + <flag name="minimal">Do not install <pkg>x11-wm/openbox</pkg>window manager</flag> + <flag name="powermanagement">Install <pkg>lxqt-base/lxqt-powermanagement</pkg> package</flag> + <flag name="processviewer">Install <pkg>x11-misc/qps</pkg> package</flag> + <flag name="screenshot">Install <pkg>x11-misc/screengrab</pkg> package</flag> + <flag name="sddm">Install <pkg>x11-misc/sddm</pkg> display manager</flag> + <flag name="ssh-askpass">Install <pkg>lxqt-base/lxqt-openssh-askpass</pkg> user password prompt tool</flag> <flag name="sudo">Install <pkg>lxqt-base/lxqt-sudo</pkg></flag> - <flag name="terminal" restrict=">=lxqt-base/lxqt-meta-0.13.0">Install - <pkg>x11-terms/qterminal</pkg> package</flag> + <flag name="terminal">Install <pkg>x11-terms/qterminal</pkg> package</flag> </use> </pkgmetadata> diff --git a/lxqt-base/lxqt-notificationd/Manifest b/lxqt-base/lxqt-notificationd/Manifest index 3110ad596165..11b74532469d 100644 --- a/lxqt-base/lxqt-notificationd/Manifest +++ b/lxqt-base/lxqt-notificationd/Manifest @@ -1,2 +1 @@ -DIST lxqt-notificationd-0.11.0.tar.xz 30592 BLAKE2B d30ddedf7cc66bc951291110d43c458ff8c4b229189a3d1f3b59be29e0e45ad03ae9839a31aa5dd268121bb6a7266e05d30221ee9cb44a39bbb36cd937c85ebd SHA512 f6dd3463ac993d7c7743addd6924dc8f15717f658c576c78ad01e4db361d1f1c98d02f6a2bec0069c191ad923b1ff63d49faf6ff7d564f67030233d6979adec5 DIST lxqt-notificationd-0.13.0.tar.xz 32364 BLAKE2B c43e57e66e2fdd375f25afd68acc428c6204992e48c2b2bf1a692380bcb2f48663c52b3a5a9b17d01a68d6cb57e6779260da3c9e09873baa0a8c7489dfa9c9a7 SHA512 2bc75b840a666e013d914f08719680cf3af7430a6acfb5072facff8bdc964aeef1d5227c68b5a5c5d8a6d6c572632105e3f2f04c517d8e8669eb40b5a0cf0f4d diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.11.0.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.11.0.ebuild deleted file mode 100644 index b7eae03c514f..000000000000 --- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.11.0.ebuild +++ /dev/null @@ -1,38 +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 notification daemon and library" -HOMEPAGE="https://lxqt.org" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://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" - -RDEPEND=" - >=dev-libs/libqtxdg-1.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-${PV} - =lxqt-base/lxqt-common-0.11*" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5" - -src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) - cmake-utils_src_configure -} diff --git a/lxqt-base/lxqt-openssh-askpass/Manifest b/lxqt-base/lxqt-openssh-askpass/Manifest index 6b1de21be77b..1ba14ff971f9 100644 --- a/lxqt-base/lxqt-openssh-askpass/Manifest +++ b/lxqt-base/lxqt-openssh-askpass/Manifest @@ -1,2 +1 @@ -DIST lxqt-openssh-askpass-0.11.0.tar.xz 14028 BLAKE2B fb65748f8246fe5783d67aee1b96759a0a8a5be15b4330d2ad3ef2654b3dde59d7a7ca6e993992af5a79deefaff952c1f8f6d42795029c6f200ff2a26e79f6d3 SHA512 746c70677af0d93544de805ec53c8cba3eea81a32d0592cf3a14a350095b26097880d0da70db46161e03957b31b8b1e308e657fd2b04b8646b131e44d984d6d4 DIST lxqt-openssh-askpass-0.13.0.tar.xz 14336 BLAKE2B c9265f0df40dd4826c08cf3f3cc2bd6304db40770b402c117adcb73afd823b5937df8a40e2deaa67c4d7cd581ffd5cca7cca48f41b4059ffc14e6a6bb66c041c SHA512 2ef92c8a75139d8827e38e0f406f9f9f52717b0918ff511baa376825cfb586f2821186692e1e63bd4c569c441ea4eff63a11f59b89a90f47738ece86a898e761 diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.11.0.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.11.0.ebuild deleted file mode 100644 index bf937cff1423..000000000000 --- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.11.0.ebuild +++ /dev/null @@ -1,48 +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 OpenSSH user password prompt tool" -HOMEPAGE="https://lxqt.org" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://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="LGPL-2.1+" -SLOT="0" - -RDEPEND=" - >=dev-libs/libqtxdg-1.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 - ~lxqt-base/liblxqt-${PV} - x11-libs/libX11 -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 -" - -src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) - cmake-utils_src_configure -} - -src_install(){ - cmake-utils_src_install - doman man/*.1 - - echo "SSH_ASKPASS='${EPREFIX}/usr/bin/lxqt-openssh-askpass'" >> "${T}/99${PN}" \ - || die - doenvd "${T}/99${PN}" -} diff --git a/lxqt-base/lxqt-panel/Manifest b/lxqt-base/lxqt-panel/Manifest index 2aafb9440a83..28f8066f4a18 100644 --- a/lxqt-base/lxqt-panel/Manifest +++ b/lxqt-base/lxqt-panel/Manifest @@ -1,2 +1 @@ -DIST lxqt-panel-0.11.0.tar.xz 262964 BLAKE2B 6cbb741731e89dbe99fefc8ceb983e346128a3122507a6816db848c9bed0b8f4f3b5f08e8f7ccd3a1b72ed7161a0772188836bec55610e248c17425f806dec44 SHA512 875ec28868bb68dff8c4e3be0adb5e5c88213f9ebdeb83eb0df9d5c31a7b4cb70a4d9b347f1ed9526a1eef7adb07f92c36263e12a6455291ec7022901abd100c DIST lxqt-panel-0.13.0.tar.xz 273924 BLAKE2B affed55daf1c0a4bf20faeb35278a7d0c7474e514627d24c33469954bcf57ef2c5ee0ac1346918a3edc58f929f07a923e730d0c8ec1d32eeb3d2af41134beced SHA512 f9ea21a24aa8fc0898c756349256a9a84f4e8469743383ce4372f5ab3719170c84ec731d661f7b3355b7501f16fa862ef9d64b7b346e8abd4cbceb547fcb18e3 diff --git a/lxqt-base/lxqt-panel/files/lxqt-panel-0.11.0-fix-undef-explicit.patch b/lxqt-base/lxqt-panel/files/lxqt-panel-0.11.0-fix-undef-explicit.patch deleted file mode 100644 index c6349c25cba0..000000000000 --- a/lxqt-base/lxqt-panel/files/lxqt-panel-0.11.0-fix-undef-explicit.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ec62109e0fa678875a9b10fc6f1975267432712d Mon Sep 17 00:00:00 2001 -From: Palo Kisa <palo.kisa@gmail.com> -Date: Mon, 30 Jan 2017 12:21:10 +0100 -Subject: [PATCH] plugin-kbindicator: Undef the "explicit" workaround - -..after include and add explanation of the workaround. - -closes lxde/lxqt#1251 ---- - plugin-kbindicator/src/x11/kbdlayout.cpp | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/plugin-kbindicator/src/x11/kbdlayout.cpp b/plugin-kbindicator/src/x11/kbdlayout.cpp -index c4aa4e27..883df074 100644 ---- a/plugin-kbindicator/src/x11/kbdlayout.cpp -+++ b/plugin-kbindicator/src/x11/kbdlayout.cpp -@@ -33,8 +33,15 @@ - - #include <xkbcommon/xkbcommon-x11.h> - #include <xcb/xcb.h> -+ -+// Note: We need to override "explicit" as this is a C++ keyword. But it is -+// used as variable name in xkb.h. This is causing a failure in C++ compile -+// time. -+// Similar bug here: https://bugs.freedesktop.org/show_bug.cgi?id=74080 - #define explicit _explicit - #include <xcb/xkb.h> -+#undef explicit -+ - #include "../kbdinfo.h" - #include "../controls.h" - diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild deleted file mode 100644 index f37be9fee9f2..000000000000 --- a/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild +++ /dev/null @@ -1,85 +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 desktop panel and plugins" -HOMEPAGE="https://lxqt.org" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://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="LGPL-2.1+" -SLOT="0" -IUSE="+alsa +clock colorpicker cpuload +desktopswitch dom +kbindicator +mainmenu - +mount networkmonitor pulseaudio +quicklaunch sensors +showdesktop - statusnotifier sysstat +taskbar +tray +volume worldclock" -REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )" - -CDEPEND=" - dev-libs/glib:2 - >=dev-libs/libqtxdg-1.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/kguiaddons:5 - kde-frameworks/kwindowsystem:5[X] - >=lxde-base/menu-cache-0.3.3 - ~lxqt-base/liblxqt-${PV} - ~lxqt-base/lxqt-globalkeys-${PV} - x11-libs/libX11 - cpuload? ( sys-libs/libstatgrab ) - kbindicator? ( x11-libs/libxkbcommon ) - mount? ( kde-frameworks/solid:5 ) - networkmonitor? ( sys-libs/libstatgrab ) - sensors? ( sys-apps/lm_sensors ) - statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] ) - sysstat? ( =lxqt-base/libsysstat-0.3* ) - tray? ( x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXrender ) - volume? ( alsa? ( media-libs/alsa-lib ) - pulseaudio? ( media-sound/pulseaudio ) )" -DEPEND="${CDEPEND} - dev-qt/linguist-tools:5" -RDEPEND="${CDEPEND} - dev-qt/qtsvg:5 - >=lxde-base/lxmenu-data-0.1.2" - -PATCHES=( - "${FILESDIR}"/${P}-fix-undef-explicit.patch -) - -src_configure() { - local mycmakeargs i y - mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) - for i in clock colorpicker cpuload desktopswitch dom kbindicator mainmenu mount \ - networkmonitor quicklaunch sensors showdesktop statusnotifier \ - sysstat taskbar tray volume worldclock; do - #Switch to ^^ when we switch to EAPI=6. - #y=${i^^} - y=$(tr '[:lower:]' '[:upper:]' <<< "${i}") - mycmakeargs+=( $(cmake-utils_use ${i} ${y}_PLUGIN) ) - done - - if use volume; then - mycmakeargs+=( $(cmake-utils_use alsa VOLUME_USE_ALSA) - $(cmake-utils_use pulseaudio VOLUME_USE_PULSEAUDIO) ) - fi - - cmake-utils_src_configure -} - -src_install(){ - cmake-utils_src_install - doman panel/man/*.1 -} diff --git a/lxqt-base/lxqt-policykit/Manifest b/lxqt-base/lxqt-policykit/Manifest index 9b40c1fedd69..b3c8b58eda7a 100644 --- a/lxqt-base/lxqt-policykit/Manifest +++ b/lxqt-base/lxqt-policykit/Manifest @@ -1,2 +1 @@ -DIST lxqt-policykit-0.11.0.tar.xz 31336 BLAKE2B d0e562660e3aabb7fa46447dae27d60ef3b1b9429deaa9f21a6e1659032f5bff8d9639e6f6639c13a239c2f6978808f0bf8283612eefce20854cd08ce8d7f00a SHA512 f4c8a154e30df18118444d8caf09bd242aafb17309bba77f1153a6b3db74291d35fe10ffba716293203095bcaa70195414e6b10773f8fe3b48829ab72820e5ae DIST lxqt-policykit-0.13.0.tar.xz 33144 BLAKE2B ae9416d9e7c98c67d3d428ccc28e28a97461f6213e58f90968a44654ffe94246f3eb5f8d51617a2626d805a097f5cdc531c2567fbfb6e3cead2f3aae7c3a625e SHA512 c02525ed60c3882b9fc431630a750937425f8ff296fa82112a2e88cb9d5b96767e2a8ff514daeee5d6dded96536cbb4520bc7bccb6c8fbe4e405168435f9f22e diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-0.11.0.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-0.11.0.ebuild deleted file mode 100644 index 8c93093f15f0..000000000000 --- a/lxqt-base/lxqt-policykit/lxqt-policykit-0.11.0.ebuild +++ /dev/null @@ -1,44 +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 PolKit authentication agent" -HOMEPAGE="https://lxqt.org" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://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" - -RDEPEND=" - dev-libs/glib:2 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - ~lxqt-base/liblxqt-${PV} - >=dev-libs/libqtxdg-1.0.0 - sys-auth/polkit-qt[qt5(+)]" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - virtual/pkgconfig" - -src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) - cmake-utils_src_configure -} - -src_install(){ - cmake-utils_src_install - doman man/*.1 -} diff --git a/lxqt-base/lxqt-powermanagement/Manifest b/lxqt-base/lxqt-powermanagement/Manifest index 1f8fc05c1e2d..86936a492ee3 100644 --- a/lxqt-base/lxqt-powermanagement/Manifest +++ b/lxqt-base/lxqt-powermanagement/Manifest @@ -1,2 +1 @@ -DIST lxqt-powermanagement-0.11.0.tar.xz 29680 BLAKE2B 46242ed3d05f3ab198225baba34c5a651882c2a99da3b44201a55a3204071002d19d59e34f5aca2cb744f6a2e08e926b008c8f1c12fb94d3386b242223580e4e SHA512 8cf90334078e95303f938b180cf21f40624bd150f03d72e5975eb105df96154f7d2703476e95ca40923ce56a0e5be81c1db570033bd9ad5fe17afb081b98f0c0 DIST lxqt-powermanagement-0.13.0.tar.xz 31488 BLAKE2B 0c236015333c013df791bf86ab9c5f1aa3bb8f50c298d40214cb41517c82e646de77439321b3f7bffcabc56553758979ee449fb6e67a7e7f7981860ccde28401 SHA512 849bcd0739e30b0450d358e23edb9bf800e3804e0929d78d9d08c640355b6eb9351df458025fc381215734690ea902ec1896f5e070fd19ad006520148233d77d diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.11.0.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.11.0.ebuild deleted file mode 100644 index ba646f46d550..000000000000 --- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.11.0.ebuild +++ /dev/null @@ -1,41 +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 daemon for power management and auto-suspend" -HOMEPAGE="https://lxqt.org" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://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="LGPL-2.1+" -SLOT="0" - -CDEPEND=" - >=dev-libs/libqtxdg-1.0.0 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - kde-frameworks/kidletime:5 - kde-frameworks/solid:5 - ~lxqt-base/liblxqt-${PV}" -DEPEND="${CDEPEND} - dev-qt/linguist-tools:5 - virtual/pkgconfig" -RDEPEND="${CDEPEND} - || ( sys-power/upower sys-power/upower-pm-utils )" - -src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) - cmake-utils_src_configure -} diff --git a/lxqt-base/lxqt-qtplugin/Manifest b/lxqt-base/lxqt-qtplugin/Manifest index 7c42b896f749..4142c269d4b1 100644 --- a/lxqt-base/lxqt-qtplugin/Manifest +++ b/lxqt-base/lxqt-qtplugin/Manifest @@ -1,2 +1 @@ -DIST lxqt-qtplugin-0.11.0.tar.xz 20764 BLAKE2B b70fcb267c525a30e07cf8146e8267f1125504c4c87197f93256f7563b64b4970fe6980e4472bf60d6a3a670a68dbc0c98bcd94d451ffe0bed1aa403b163ff8d SHA512 2e8d1e26b1b2d28bb874d1eb61a2e6a678e8b3477957016bc8e9783a13c821450746cbfe59954a09142d94e67203ef8a28eab8ff8d3d0798f87b5a920ec80b09 DIST lxqt-qtplugin-0.13.0.tar.xz 23888 BLAKE2B 564a88cb04416b078e0c415efcb78be7acb7d3fa703bf4c30d75cb0e4aba00b443e021f6d37f9fcc983233824a71cd9b15c45b14579310ce9b3b89a2a1d88c5c SHA512 22f059accdca8216b80af8773eab462c779c489575aa7802e82bb95da4f22a9a0d5a1234b2da4cb39c5050a6e9ded3c2b977068cc37af356ecb09e364633c7d6 diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.11.0.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.11.0.ebuild deleted file mode 100644 index 074dbea50b08..000000000000 --- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.11.0.ebuild +++ /dev/null @@ -1,35 +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 integration plugin for Qt" -HOMEPAGE="https://lxqt.org" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://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="LGPL-2.1+" -SLOT="0" - -RDEPEND=" - dev-libs/libdbusmenu-qt[qt5(+)] - >=dev-libs/libqtxdg-2.0.0 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ~lxqt-base/liblxqt-${PV} - x11-libs/libX11" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5" - -src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) - cmake-utils_src_configure -} diff --git a/lxqt-base/lxqt-runner/Manifest b/lxqt-base/lxqt-runner/Manifest index d654987f372c..164b0e4b9d05 100644 --- a/lxqt-base/lxqt-runner/Manifest +++ b/lxqt-base/lxqt-runner/Manifest @@ -1,2 +1 @@ -DIST lxqt-runner-0.11.0.tar.xz 209040 BLAKE2B eec9d11f06e31b758b46216ed9b52050b6bb3c7cd697af5aee735e01815a67af3b3879cbb8c2a57f9ad340325db48b729fe58a014c09017b240e93bbf7d22385 SHA512 ced1f790a688fc6b167d96fcfc0f32a695c727e6bf3e4eaa43a0b4d1fb1379312788e2d190f77ade8b18fdce2d2993a7546bcb3a0246efd83e7fdb231b421fb5 DIST lxqt-runner-0.13.0.tar.xz 211776 BLAKE2B bed474f25f485e5c9099b12f65c1b46509427fc6d5d50ac345e83e473d4001679668f19265f9bae442e0c6b196d4f00922b9a38991929f71e30d2b4357c53708 SHA512 fed007134f252f10d215266005a03354f70960cbe77ad37bb00db27e0054b0c508e5dd15a07630525b134c2ecb7db2e36f6304c9cbff60dcf4c3831dd31641c7 diff --git a/lxqt-base/lxqt-runner/lxqt-runner-0.11.0.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-0.11.0.ebuild deleted file mode 100644 index 92c648cc33d5..000000000000 --- a/lxqt-base/lxqt-runner/lxqt-runner-0.11.0.ebuild +++ /dev/null @@ -1,47 +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 quick launcher" -HOMEPAGE="https://lxqt.org" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://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" - -RDEPEND=">=dev-cpp/muParser-2.2.3 - dev-libs/glib:2 - >=dev-libs/libqtxdg-1.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 - >=lxde-base/menu-cache-0.5.1 - ~lxqt-base/liblxqt-${PV} - ~lxqt-base/lxqt-globalkeys-${PV}" -DEPEND="${RDEPEND} - >=dev-util/cmake-3.6.2 - dev-qt/linguist-tools:5 - virtual/pkgconfig" - -src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) - cmake-utils_src_configure -} - -src_install(){ - cmake-utils_src_install - doman man/*.1 -} diff --git a/lxqt-base/lxqt-session/Manifest b/lxqt-base/lxqt-session/Manifest index c32fa7bb10ab..c9909c278899 100644 --- a/lxqt-base/lxqt-session/Manifest +++ b/lxqt-base/lxqt-session/Manifest @@ -1,2 +1 @@ -DIST lxqt-session-0.11.0.tar.xz 120680 BLAKE2B c62ab38cc3926666ad4ed2d6ba2fb0f1f1979ef14f53aaba1d213238b16907762d3caa0b170e0580578f482ce37d8cd5365d2711d8f10b5168667f17619736c8 SHA512 3f45d3c8ca2856ab37e88554f5021a7003e2293552532b65b53a84fc886e8b5f4f0fa3e90b1b288d2f866f07a29e3170305dc611c4f31c6112a824886768dab9 DIST lxqt-session-0.13.0.tar.xz 135240 BLAKE2B 6856b6a14e635408ec86d612ebd549431afba74d990c23977ef8e14cdc043b039888ff5e0a67f265ff4085d936f5fc3d655a4bfcb94f342bef375d597d05de82 SHA512 3ab6161ee75340f823ec82d20ead9eacf7441fd675e2f8a295fc301187e027013c8a2a4e7ca1262795e9b07d3231dbab032363cadde3bf334865260142529316 diff --git a/lxqt-base/lxqt-session/lxqt-session-0.11.0.ebuild b/lxqt-base/lxqt-session/lxqt-session-0.11.0.ebuild deleted file mode 100644 index 0965f9eeb740..000000000000 --- a/lxqt-base/lxqt-session/lxqt-session-0.11.0.ebuild +++ /dev/null @@ -1,50 +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 session manager" -HOMEPAGE="https://lxqt.org" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://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/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[X] - ~lxqt-base/liblxqt-${PV} - x11-libs/libX11 - x11-misc/xdg-user-dirs" -DEPEND="${CDEPEND} - dev-qt/linguist-tools:5 - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" -RDEPEND="${CDEPEND} - =lxqt-base/lxqt-common-0.11*" - -src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) - cmake-utils_src_configure -} - -src_install(){ - cmake-utils_src_install - doman lxqt-config-session/man/*.1 lxqt-session/man/*.1 -} diff --git a/lxqt-base/lxqt-sudo/Manifest b/lxqt-base/lxqt-sudo/Manifest index 539699d5eb23..204a4c05dfff 100644 --- a/lxqt-base/lxqt-sudo/Manifest +++ b/lxqt-base/lxqt-sudo/Manifest @@ -1,2 +1 @@ -DIST lxqt-sudo-0.11.0.tar.xz 15960 BLAKE2B 5b4c4f8c748f330508665141d02eb62e1a2804c6510f7fc455c2761527436c8a81c2e3d0ac6484511effe3485d712e10a2741fe1019356480e5824cbb97482f1 SHA512 42f8a74898ed4fa81fcff06837e69e0c7cb4f2fb81b21a0167afd5f0557fab48022de0849c83dcb5e04e2f3f3af54cd0c2c8fc27cde15ad380163a7a9fe1724e DIST lxqt-sudo-0.13.0.tar.xz 16208 BLAKE2B 83da7ca7fcd4f670e5569ea9869047eafbac68fd43469a3fba1ba51470f9417fbfa7403f1b854b4270aa9b4779475b7a2a97dcb755e02c189b4d87bd969d4b57 SHA512 ea7d8ca093e736e3cf581605598cb9c8ed4e40bc39fb94a4b44334e7f58ae53c489ede0dcfc75de8daf58c115c1a91ae152f676276488df8a16ed53bbf56fc82 diff --git a/lxqt-base/lxqt-sudo/lxqt-sudo-0.11.0.ebuild b/lxqt-base/lxqt-sudo/lxqt-sudo-0.11.0.ebuild deleted file mode 100644 index d6b1fb0285a2..000000000000 --- a/lxqt-base/lxqt-sudo/lxqt-sudo-0.11.0.ebuild +++ /dev/null @@ -1,34 +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 GUI frontend for sudo" -HOMEPAGE="https://lxqt.org" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://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="LGPL-2.1+" -SLOT="0" - -DEPEND="app-admin/sudo - >=dev-libs/libqtxdg-1.0.0 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ~lxqt-base/liblxqt-${PV} - " -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) - cmake-utils_src_configure -} |