Hello community,
here is the log from the commit of package kde-gtk-config5 for openSUSE:Factory checked in at 2016-10-18 09:58:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kde-gtk-config5 (Old)
and /work/SRC/openSUSE:Factory/.kde-gtk-config5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kde-gtk-config5"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kde-gtk-config5/kde-gtk-config5.changes 2016-10-04 15:48:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kde-gtk-config5.new/kde-gtk-config5.changes 2016-10-18 09:58:07.000000000 +0200
@@ -1,0 +2,13 @@
+Tue Oct 11 15:44:28 UTC 2016 - fabian@ritter-vogt.de
+
+- Update to 5.8.1
+ * New bugfix release
+ * For more details please see:
+ https://www.kde.org/announcements/plasma-5.8.1.php
+
+-------------------------------------------------------------------
+Wed Oct 5 07:58:43 UTC 2016 - fabian@ritter-vogt.de
+
+- Add Source: URL back
+
+-------------------------------------------------------------------
Old:
----
kde-gtk-config-5.8.0.tar.xz
New:
----
kde-gtk-config-5.8.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kde-gtk-config5.spec ++++++
--- /var/tmp/diff_new_pack.Jk2jBI/_old 2016-10-18 09:58:08.000000000 +0200
+++ /var/tmp/diff_new_pack.Jk2jBI/_new 2016-10-18 09:58:08.000000000 +0200
@@ -18,7 +18,7 @@
%bcond_without lang
Name: kde-gtk-config5
-Version: 5.8.0
+Version: 5.8.1
Release: 0
Summary: KCM Module to Configure GTK2 and GTK3 Applications Appearance Under KDE
License: LGPL-3.0+ and GPL-3.0+
@@ -27,7 +27,7 @@
Source1: kde_gtk_config.suse.sh
Source2: gtkrc-2.0-kde4.template
Source3: gtk3-settings.ini-kde4.template
-Source: kde-gtk-config-%{version}.tar.xz
+Source: http://download.kde.org/stable/plasma/%{version}/kde-gtk-config-%{version}.tar.xz
BuildRequires: extra-cmake-modules >= 0.0.9
BuildRequires: kf5-filesystem
BuildRequires: xz
++++++ kde-gtk-config-5.8.0.tar.xz -> kde-gtk-config-5.8.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-gtk-config-5.8.0/CMakeLists.txt new/kde-gtk-config-5.8.1/CMakeLists.txt
--- old/kde-gtk-config-5.8.0/CMakeLists.txt 2016-09-29 13:22:22.000000000 +0200
+++ new/kde-gtk-config-5.8.1/CMakeLists.txt 2016-10-11 14:23:53.000000000 +0200
@@ -1,5 +1,5 @@
project(kde-gtk-config)
-set(PROJECT_VERSION "5.8.0")
+set(PROJECT_VERSION "5.8.1")
cmake_minimum_required(VERSION 2.8.12)
find_package(ECM 0.0.9 REQUIRED NO_MODULE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-gtk-config-5.8.0/po/zh_CN/kde-gtk-config.po new/kde-gtk-config-5.8.1/po/zh_CN/kde-gtk-config.po
--- old/kde-gtk-config-5.8.0/po/zh_CN/kde-gtk-config.po 2016-09-29 13:22:22.000000000 +0200
+++ new/kde-gtk-config-5.8.1/po/zh_CN/kde-gtk-config.po 2016-10-11 14:23:48.000000000 +0200
@@ -8,7 +8,7 @@
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2016-08-13 07:30+0000\n"
-"PO-Revision-Date: 2016-08-15 17:04-0800\n"
+"PO-Revision-Date: 2016-10-04 11:47-0800\n"
"Last-Translator: Weng Xuetian \n"
"Language-Team: Chinese \n"
"Language: zh_CN\n"
@@ -322,7 +322,7 @@
#. i18n: ectx: property (text), widget (QLabel, label_4)
#: src/ui/gui.ui:172
msgid "Left mouse button warps scroll bar:"
-msgstr ""
+msgstr "使用鼠标左键在滚动条上跳转:"
#. i18n: ectx: property (title), widget (QGroupBox, groupBox_6)
#: src/ui/gui.ui:207
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-gtk-config-5.8.0/src/iconthemesmodel.cpp new/kde-gtk-config-5.8.1/src/iconthemesmodel.cpp
--- old/kde-gtk-config-5.8.0/src/iconthemesmodel.cpp 2016-09-29 13:22:16.000000000 +0200
+++ new/kde-gtk-config-5.8.1/src/iconthemesmodel.cpp 2016-10-11 14:23:38.000000000 +0200
@@ -1,5 +1,5 @@
/* KDE GTK Configuration Module
- *
+ *
* Copyright 2011 José Antonio Sanchez Reynaga
* Copyright 2011 Aleix Pol Gonzalez
*
@@ -10,19 +10,20 @@
* later version accepted by the membership of KDE e.V. (or its
* successor approved by the membership of KDE e.V.), which shall
* act as a proxy defined in Section 6 of version 3 of the license.
- *
+ *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
+ *
+ * You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see http://www.gnu.org/licenses/.
*/
#include "iconthemesmodel.h"
#include <QDir>
#include <QDirIterator>
+#include <QDebug>
#include <QSet>
#include <KIconTheme>
#include <QStandardPaths>
@@ -43,15 +44,15 @@
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);
while(it.hasNext()) {
QString currentPath = it.next();
QDir dir(currentPath);
-
- if(dir.exists() && !dir.exists("cursors") && dir.exists("index.theme")) {
+
+ if(dir.exists() && dir.exists("index.theme")) {
availableIcons << dir;
}
}
@@ -81,7 +82,7 @@
foreach(const QFileInfo& f, entries) {
return f.absoluteFilePath();
}
-
+
QStringList subdirs = directory.entryList(QDir::AllDirs|QDir::NoDotAndDotDot);
qSort(subdirs.begin(), subdirs.end(), greatSizeIs48);
foreach(const QString& subdir, subdirs) {
@@ -89,40 +90,36 @@
if(!ret.isEmpty())
return ret;
}
-
- return QString();
-}
-void IconThemesModel::fillItem(const QDir& dir, QStandardItem* item)
-{
- KIconTheme theme(dir.dirName());
-
- item->setText(theme.name());
- item->setToolTip(theme.description());
- item->setData(theme.inherits(), IconThemesModel::InheritsRole);
- QString iconName = theme.example();
-
- if(!iconName.isEmpty()) {
- QString path = IconThemesModel::findIconRecursivelyByName(iconName, dir.path());
- item->setIcon(QIcon(path));
- }
-
- if(item->icon().isNull()) {
- QString path = IconThemesModel::findFilesRecursively(QStringList("*.png") << "*.svg" << "*.svgz", dir.path());
- item->setIcon(QIcon(path));
- }
+ return QString();
}
void IconThemesModel::reload()
{
clear();
-
+
QList<QDir> paths = installedThemesPaths();
Q_FOREACH(const QDir& dir, paths) {
- QStandardItem* themeit = new QStandardItem(dir.dirName());
- themeit->setData(dir.path(), PathRole);
- themeit->setData(dir.dirName(), DirNameRole);
- fillItem(dir, themeit);
- appendRow(themeit);
+ KIconTheme theme(dir.dirName());
+ if (!theme.isValid()) {
+ qWarning() << "invalid theme" << dir.dirName();
+ continue;
+ }
+
+ QStandardItem* item = new QStandardItem(dir.dirName());
+ item->setData(dir.path(), PathRole);
+ item->setData(dir.dirName(), DirNameRole);
+
+ item->setText(theme.name());
+ item->setToolTip(theme.description());
+ item->setData(theme.inherits(), IconThemesModel::InheritsRole);
+ QString iconName = theme.example();
+ if (iconName.isEmpty())
+ iconName = QStringLiteral("folder");
+
+ QString path = theme.iconPathByName(iconName, 16, KIconLoader::MatchBest);
+ item->setIcon(QIcon(path));
+
+ appendRow(item);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-gtk-config-5.8.0/src/iconthemesmodel.h new/kde-gtk-config-5.8.1/src/iconthemesmodel.h
--- old/kde-gtk-config-5.8.0/src/iconthemesmodel.h 2016-09-29 13:22:16.000000000 +0200
+++ new/kde-gtk-config-5.8.1/src/iconthemesmodel.h 2016-10-11 14:23:38.000000000 +0200
@@ -37,7 +37,6 @@
static QString findIconRecursivelyByName(const QString& name, const QDir& directory);
private:
- static void fillItem(const QDir& dir, QStandardItem* item);
static QString findFilesRecursively(const QStringList& wildcard, const QDir& directory);
QList<QDir> installedThemesPaths();
bool m_onlyHome;