summaryrefslogtreecommitdiff
path: root/lxqt-base/lxqt-config
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
committerV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
commit4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
treeba5f07bf3f9d22d82e54a462313f5d244036c768 /lxqt-base/lxqt-config
reinit the tree, so we can have metadata
Diffstat (limited to 'lxqt-base/lxqt-config')
-rw-r--r--lxqt-base/lxqt-config/Manifest8
-rw-r--r--lxqt-base/lxqt-config/files/lxqt-config-0.11.0-cmake-3.8.patch221
-rw-r--r--lxqt-base/lxqt-config/lxqt-config-0.10.0.ebuild49
-rw-r--r--lxqt-base/lxqt-config/lxqt-config-0.11.0.ebuild56
-rw-r--r--lxqt-base/lxqt-config/metadata.xml8
5 files changed, 342 insertions, 0 deletions
diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest
new file mode 100644
index 000000000000..894b8148b758
--- /dev/null
+++ b/lxqt-base/lxqt-config/Manifest
@@ -0,0 +1,8 @@
+AUX lxqt-config-0.11.0-cmake-3.8.patch 8137 SHA256 5771f6cce6de6572d8ceef81183dcfa8c53196fb153faaed896155a90f772be7 SHA512 4283f50dec924245329a47800987e355d5df8ee17db0f2394ca313faed4bb5e45e6c891619b9d81b55a2d0b083119d49dc4d06cbfe5bab17821a9702fa0d438f WHIRLPOOL a2c702c0cff5ca79eb69bb310c1625656239dc48a4c7f14c1c343ff665c6fa75c9950d882d28c4d3e1ba1364a95d1fd220e9efd7b72e28d52bfc277c1383af1d
+DIST lxqt-config-0.10.0.tar.xz 154568 SHA256 4567be4653f2f1f9ff156126250a08d7b480f627fa1410484d49f65ba5dab9b4 SHA512 1865d6eb133ee294192e30a3e658b76335012b049543b499ebe5b9f01e2158fff65078a68f044b1b08f22c43edb87e7938844a700a723acfce053d75956c29a3 WHIRLPOOL d1098d5048b99555554dd6430206f8136257b2b55252073dd634be6062248f8fd2e8d11088ac2a6a7fd6b25422d5e2cecf0e54b3649f8762dfb97131d2810e06
+DIST lxqt-config-0.11.0.tar.xz 197112 SHA256 e254994caf0535bf6f9da659dc4410b63b5b5cfabea0b961bfb8c00e3c393d38 SHA512 20a573ba6cb83ef19b58a31180924e527496f4eb5d5f9bcf1eb37e3883b8b46ea02f08be9fe42a06f12508ffa2a9af5225d3fe00856ee7807704a99adf654795 WHIRLPOOL 9d47aa2d371b0c41312f53c64d08506693e1fdb78f365c224ffefe6ed12ac5a656d23c28af849f3d89443bfa9091396083c1ad1c49ddad2b8b8281a622caf64a
+EBUILD lxqt-config-0.10.0.ebuild 1064 SHA256 135e97f081327e72ae3c73330313a040fb46ee1d94a8185f8ddec7e36d773827 SHA512 6ac4f5deb43e0d7d24f882626bc0db90bd52ef70db5dbb0e040e08b3ec421f9a2042bc850cb0c4df930b420e5dad4a6b10fdbe2e286c197c2e8609d5cc2cb584 WHIRLPOOL 88d5503e2ef8f2e5d209230791fb9121d46e35e3e25b696e3f794113289981a304f678d972a35bcdc92deddf6571bf39dea8774aa8f8f4198614afc2181ab9ab
+EBUILD lxqt-config-0.11.0.ebuild 1207 SHA256 f5cd46dda96c21caa76da1dbd0ea019f10f790d18f99cb5093b7410a21611b26 SHA512 4ec0d5741adf8400ad3d346e0fd2fe5712055d5e61a942929ec9d78f1218f74a3ea3b9d09d2a17501e208bf3ac59a31ea85ce308f10bc3cf5c87cfea69d38608 WHIRLPOOL 27ad79a7b4dadb75934f1ce522e5cf64b86edfb84291f8e7ad80cf2df5eb761be22ac37dbf08fa773f88ca801ccef04e46fce17f53a56f3dd6d2216b042d1766
+MISC ChangeLog 4337 SHA256 2ccae5ae886a4c289881934ad8e08f8f24877cd59efb75a65bf7be823c5a925e SHA512 f0b2a7ae6cdfaf821704db6ef4f5fc26926d295d6d6b46c2eae79d39f52705f7bfe569fdb52408d183f433a9a6e0f463d73bae326c37986f323e646d30b0d123 WHIRLPOOL dd6176de589b346340fce74fa80f60eb6fa6d6b0d4a73a45a8a780a5a4b6c8b3e2f0fc3fe431272309efffca0107c89f9022293f274d2e4baf46a3279dcd5bdf
+MISC ChangeLog-2015 1759 SHA256 deeae98ea1f4cc893232ab8e1c43ac50c880c29ab3476972ec2f9c0b40c92559 SHA512 767c73971d88b42159d689783ff9a998a04fa09672b58ea8d0dc0350f56df9ede5c47899148f653ac2e495c2540651d3c1adcc461a54c6f52d340da80a63009a WHIRLPOOL 01c93a983f4296e9d8397128594c16b169a90b963d16e1e1a3e008d96487789d9b91381df936e39be0526af1f537b88ed3191911dce924431d2004be059b2023
+MISC metadata.xml 240 SHA256 5c1b2e0fae64eabbb43582e437ece5c0df4f7e1c9b4587b919629b2b765aec6b SHA512 84f77a0e7d17d09eea1157217fcd22ae5fc98e1569879f85b5fc950d2b2ad00168b1ec9d5d8c1f964673c55bc91d509adb2d39b5983de21d83200ef6c58b9652 WHIRLPOOL 2bc375b8b743be2e84a38afe52329fcb6160906b0edbc054b9ab53aae30add6c8cac4de2a03c6f83e875b1e692c14f45369dcc2f8411ec9b858af228ba3ba163
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 000000000000..8088225e30df
--- /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?= <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.10.0.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.10.0.ebuild
new file mode 100644
index 000000000000..123ed73c6ff8
--- /dev/null
+++ b/lxqt-base/lxqt-config/lxqt-config-0.10.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 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://downloads.lxqt.org/lxqt/${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"
+
+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.11.0.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.11.0.ebuild
new file mode 100644
index 000000000000..268a49e56e40
--- /dev/null
+++ b/lxqt-base/lxqt-config/lxqt-config-0.11.0.ebuild
@@ -0,0 +1,56 @@
+# 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://downloads.lxqt.org/lxqt/${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/metadata.xml b/lxqt-base/lxqt-config/metadata.xml
new file mode 100644
index 000000000000..a40a83a9c6a9
--- /dev/null
+++ b/lxqt-base/lxqt-config/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>lxqt@gentoo.org</email>
+ <name>LXQt</name>
+ </maintainer>
+</pkgmetadata>