summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2016-12-09 20:16:51 +0100
committerJohannes Huber <johu@gentoo.org>2016-12-09 20:42:23 +0100
commit4eea621fcbebca17e65d37591d2de3ec634372e8 (patch)
tree91a023e160057e5767d9661449d878d5b8c435ff /kde-plasma/kde-gtk-config
parentnet-wireless/broadcom-sta: Fix download links. (diff)
downloadgentoo-4eea621fcbebca17e65d37591d2de3ec634372e8.tar.gz
gentoo-4eea621fcbebca17e65d37591d2de3ec634372e8.tar.bz2
gentoo-4eea621fcbebca17e65d37591d2de3ec634372e8.zip
kde-plasma: Remove KDE Plasma 5.7.5
Package-Manager: portage-2.3.3
Diffstat (limited to 'kde-plasma/kde-gtk-config')
-rw-r--r--kde-plasma/kde-gtk-config/Manifest1
-rw-r--r--kde-plasma/kde-gtk-config/files/kde-gtk-config-5.7.4-look-for-cursors-in-right-place.patch109
-rw-r--r--kde-plasma/kde-gtk-config/kde-gtk-config-5.7.5.ebuild61
3 files changed, 0 insertions, 171 deletions
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 180225550d3c..aa57a7f47429 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,4 +1,3 @@
DIST kde-gtk-config-2.2.1.tar.xz 86472 SHA256 9c890d7e39ab6ebfad13c5453051f0759cb61beac9f7fc2df7e331c9a4415c85 SHA512 24623b5f668cb7d5dd46b96bcd0ee1ba4f2c9068995716f6658c2bdf8a41a81d76848cf63c1749d3ff365ece0399d4a54e98be4d03f992d49a04616e26f1baeb WHIRLPOOL 49f0186c6a265eef8aa8972a77502b34bc130fd2df04faab4145c6b181ab80fdefc2b9ca7d2d7979c89a5b57e36b8d0787c986e584bd6f332915316d73c07802
-DIST kde-gtk-config-5.7.5.tar.xz 147732 SHA256 3603055a4821a0aa4250a42261004b4384b53c337ee201d03e494bb18e9602e5 SHA512 88635c51a41a5a47351fa77483ad76c27b3881be28124e53fe0e4fc571dff1596c41e61d22a3e842a81180e9e3f955d8206dfc332965f84be20e47295142ffcb WHIRLPOOL 28231cbc4ac576b8b3d059e9b17faef099b103784386c0f54a6c86a1ccecebc500183fb200a438383c36211a49171b48096b0ce0218598746aed7662d847009c
DIST kde-gtk-config-5.8.3.tar.xz 149984 SHA256 6d548f2143c0f7f2624aa857cb54c79a40cdb868942f68ab487eac86fef47d78 SHA512 247b8a07f077adc767b727b58406dff1148e9e21b695e98d63ef34c0590444933f0120a035a9e9df9e74570132f72f317396c7b7c6a68765733c5e1600286720 WHIRLPOOL 593998e11325e3cde9a9c6bfffbf11fd55ef877c6e24f27d5c6edbb7553cd844f0002d013e20598c98e832e0450327588ea59f306a17d85e1cca144c2ee6db82
DIST kde-gtk-config-5.8.4.tar.xz 150876 SHA256 c4366e00569d8d9159ca05d183e48a1fcb5aa2e97b3851d9ca89ca31373f5c96 SHA512 87b7568fe3e20cdf5f7123752d734dc2f8abba370781cfc6d2dceddaf8d518b2543c379d539f388f151138dd3672919674c625c847309816e69b282249db6ec3 WHIRLPOOL 4a89a4165950751031460acb631283640a4c8eda2e60289c254e266c80e30fd96ae7196eb4602a8f0d96978cdb36a67f0d850f2d181b03d105a4326fa24815ba
diff --git a/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.7.4-look-for-cursors-in-right-place.patch b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.7.4-look-for-cursors-in-right-place.patch
deleted file mode 100644
index 81da8d67fe75..000000000000
--- a/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.7.4-look-for-cursors-in-right-place.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-commit fa473a1c4572ef3c2614318b0ce7090613878005
-Author: Jason A. Donenfeld <Jason@zx2c4.com>
-Date: Tue Sep 13 04:13:47 2016 +0200
-
- cursor model: look for cursors in correct place
-
- plasma-desktop's cursor theme kcm does the right thing, by consulting
- the libXcursor library for the right search paths. Unfortunately, the
- kcm here does a pretty butchered job of it. So, we copy, more or less,
- the same algorithm used by plasma-desktop. Now there's parity in cursor
- selection.
-
- For reference, please see line 165 of:
- https://quickgit.kde.org/?p=plasma-desktop.git&a=blob&f=kcms%2Fcursortheme%2Fxcursor%2Fthememodel.cpp
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 07d313c..88f5a47 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,6 +7,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_P
-
- find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Widgets Test)
- find_package(KF5 REQUIRED COMPONENTS I18n KIO ConfigWidgets NewStuff Archive KCMUtils IconThemes)
-+find_package(X11 REQUIRED)
-
- include_directories(
- ${CMAKE_SOURCE_DIR}
-@@ -54,7 +55,7 @@ ki18n_wrap_ui(kcm_SRCS
- )
- add_library(kcm_kdegtkconfig MODULE ${kcm_SRCS})
- target_compile_definitions(kcm_kdegtkconfig PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION}")
--target_link_libraries(kcm_kdegtkconfig KF5::I18n KF5::KIOWidgets KF5::NewStuff KF5::Archive KF5::NewStuff KF5::ConfigWidgets KF5::IconThemes)
-+target_link_libraries(kcm_kdegtkconfig ${X11_Xcursor_LIB} KF5::I18n KF5::KIOWidgets KF5::NewStuff KF5::Archive KF5::NewStuff KF5::ConfigWidgets KF5::IconThemes)
-
- kcoreaddons_desktop_to_json(kcm_kdegtkconfig kde-gtk-config.desktop)
-
-diff --git a/src/cursorthemesmodel.cpp b/src/cursorthemesmodel.cpp
-index 5238714..0e58230 100644
---- a/src/cursorthemesmodel.cpp
-+++ b/src/cursorthemesmodel.cpp
-@@ -24,12 +24,14 @@
- #include <QDir>
- #include <QDirIterator>
- #include <QSet>
--#include <KIconTheme>
- #include <QStandardPaths>
-+#include <KIconTheme>
-+#include <KShell>
-+
-+#include <X11/Xcursor/Xcursor.h>
-
--CursorThemesModel::CursorThemesModel(bool onlyHome, QObject* parent)
-+CursorThemesModel::CursorThemesModel(QObject* parent)
- : IconThemesModel(parent)
-- , m_onlyHome(onlyHome)
- {
- reload();
- }
-@@ -37,13 +39,11 @@ CursorThemesModel::CursorThemesModel(bool onlyHome, QObject* parent)
- QList<QDir> CursorThemesModel::installedThemesPaths()
- {
- QList<QDir> availableIcons;
-+ QStringList dirs(QString(XcursorLibraryPath()).split(':', QString::SkipEmptyParts));
-+
-+ std::transform(dirs.begin(), dirs.end(), dirs.begin(), KShell::tildeExpand);
-+ dirs.removeDuplicates();
-
-- QSet<QString> dirs;
-- dirs += QDir::home().filePath(".icons");
-- if(!m_onlyHome) {
-- dirs += QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "icons", QStandardPaths::LocateDirectory).toSet();
-- }
--
- foreach(const QString& dir, dirs) {
- QDir userIconsDir(dir);
- QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
-diff --git a/src/cursorthemesmodel.h b/src/cursorthemesmodel.h
-index 7658bd5..4acfa4b 100644
---- a/src/cursorthemesmodel.h
-+++ b/src/cursorthemesmodel.h
-@@ -29,14 +29,13 @@ class QDir;
- class CursorThemesModel : public IconThemesModel
- {
- public:
-- explicit CursorThemesModel(bool onlyHome=false, QObject* parent = 0);
-+ explicit CursorThemesModel(QObject* parent = 0);
-
- void reload();
-
- private:
- static void fillItem(const QDir& dir, QStandardItem* item);
- QList<QDir> installedThemesPaths();
-- bool m_onlyHome;
- };
-
- #endif // CURSORTHEMESMODEL_H
-diff --git a/src/gtkconfigkcmodule.cpp b/src/gtkconfigkcmodule.cpp
-index 7afe698..d36c6a3 100644
---- a/src/gtkconfigkcmodule.cpp
-+++ b/src/gtkconfigkcmodule.cpp
-@@ -71,7 +71,7 @@ GTKConfigKCModule::GTKConfigKCModule(QWidget* parent, const QVariantList& args )
- setButtons(KCModule::Default | KCModule::Apply);
- ui->setupUi(this);
- appareance = new AppearenceGTK;
-- m_cursorsModel = new CursorThemesModel(false, this);
-+ m_cursorsModel = new CursorThemesModel(this);
- ui->cb_cursor->setModel(m_cursorsModel);
- m_iconsModel = new IconThemesModel(false, this);
- ui->cb_icon->setModel(m_iconsModel);
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.7.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.7.5.ebuild
deleted file mode 100644
index b199a37dfad1..000000000000
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.7.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
-HOMEPAGE="https://projects.kde.org/kde-gtk-config"
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+gtk3"
-
-DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtwidgets)
- dev-libs/glib:2
- x11-libs/libXcursor
- x11-libs/gtk+:2
- gtk3? ( x11-libs/gtk+:3 )
-"
-RDEPEND="${DEPEND}
- $(add_plasma_dep kde-cli-tools)
- !kde-base/kde-gtk-config:4
- !kde-plasma/kde-gtk-config:4
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.4.2-gtk3-optional.patch"
- "${FILESDIR}/${PN}-5.7.4-look-for-cursors-in-right-place.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
- -DBUILD_gtk3proxies=$(usex gtk3)
- )
-
- kde5_src_configure
-}
-
-pkg_postinst() {
- kde5_pkg_postinst
- einfo
- elog "If you notice missing icons in your GTK applications, you may have to install"
- elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
- elog "for example."
- einfo
-}