Hello community, here is the log from the commit of package kiconthemes for openSUSE:Factory checked in at 2014-03-10 12:18:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiconthemes (Old) and /work/SRC/openSUSE:Factory/.kiconthemes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiconthemes" Changes: -------- --- /work/SRC/openSUSE:Factory/kiconthemes/kiconthemes.changes 2014-02-28 16:24:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiconthemes.new/kiconthemes.changes 2014-03-10 12:18:07.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 4 16:38:32 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 4.97.0: + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-alpha2.php + +------------------------------------------------------------------- Old: ---- kiconthemes-4.96.0.tar.xz New: ---- kiconthemes-4.97.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiconthemes.spec ++++++ --- /var/tmp/diff_new_pack.KOFFt4/_old 2014-03-10 12:18:08.000000000 +0100 +++ /var/tmp/diff_new_pack.KOFFt4/_new 2014-03-10 12:18:08.000000000 +0100 @@ -16,12 +16,12 @@ # -%define lname libKF5IconThemes4 +%define lname libKF5IconThemes5 Name: kiconthemes -Version: 4.96.0 +Version: 4.97.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.10 +BuildRequires: extra-cmake-modules >= 0.0.11 BuildRequires: fdupes BuildRequires: kconfigwidgets-devel >= %{_kf5_version} BuildRequires: kf5-filesystem @@ -89,6 +89,7 @@ %files devel %defattr(-,root,root) +%{_kf5_bindir}/kiconfinder5 %{_kf5_libdir}/libKF5IconThemes.so %{_kf5_libdir}/cmake/KF5IconThemes/ %{_kf5_includedir}/*.h ++++++ kiconthemes-4.96.0.tar.xz -> kiconthemes-4.97.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-4.96.0/.reviewboardrc new/kiconthemes-4.97.0/.reviewboardrc --- old/kiconthemes-4.96.0/.reviewboardrc 2014-02-05 00:02:37.000000000 +0100 +++ new/kiconthemes-4.97.0/.reviewboardrc 2014-03-01 12:50:56.000000000 +0100 @@ -2,3 +2,4 @@ REPOSITORY = 'git://anongit.kde.org/kiconthemes' BRANCH = 'master' TARGET_GROUPS = 'kdeframeworks' +TARGET_PEOPLE = 'cfeck' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-4.96.0/CMakeLists.txt new/kiconthemes-4.97.0/CMakeLists.txt --- old/kiconthemes-4.96.0/CMakeLists.txt 2014-02-05 00:02:37.000000000 +0100 +++ new/kiconthemes-4.97.0/CMakeLists.txt 2014-03-01 12:50:56.000000000 +0100 @@ -3,7 +3,7 @@ project(KIconThemes) # ECM setup -find_package(ECM 0.0.10 REQUIRED NO_MODULE) +find_package(ECM 0.0.11 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(KDEInstallDirs) @@ -13,13 +13,15 @@ include(GenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) +include(ECMMarkNonGuiExecutable) -set(KF5_VERSION "4.96.0") +set(KF5_VERSION "4.97.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KICONTHEMES VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kiconthemes_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5IconThemesConfigVersion.cmake") + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5IconThemesConfigVersion.cmake" + SOVERSION 5) # Dependencies set(QT_REQUIRED_VERSION 5.2.0) @@ -46,9 +48,9 @@ # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5IconThemes") -include(CMakePackageConfigHelpers) +include(ECMPackageConfigHelpers) -configure_package_config_file( +ecm_configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5IconThemesConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5IconThemesConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-4.96.0/src/CMakeLists.txt new/kiconthemes-4.97.0/src/CMakeLists.txt --- old/kiconthemes-4.96.0/src/CMakeLists.txt 2014-02-05 00:02:37.000000000 +0100 +++ new/kiconthemes-4.97.0/src/CMakeLists.txt 2014-03-01 12:50:56.000000000 +0100 @@ -1,3 +1,4 @@ +add_subdirectory(tools/kiconfinder) set(kiconthemes_SRCS kiconbutton.cpp @@ -31,7 +32,8 @@ EXPORT_NAME IconThemes ) -ecm_generate_headers( +ecm_generate_headers(KIconThemes_HEADERS + HEADER_NAMES KIconButton KIconDialog KIconEffect @@ -39,10 +41,8 @@ KIconTheme KIconEngine - MODULE_NAME KIconThemes REQUIRED_HEADERS KIconThemes_HEADERS ) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KIconThemes DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) install(TARGETS KF5IconThemes EXPORT KF5IconThemesTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-4.96.0/src/kiconeffect.cpp new/kiconthemes-4.97.0/src/kiconeffect.cpp --- old/kiconthemes-4.96.0/src/kiconeffect.cpp 2014-02-05 00:02:37.000000000 +0100 +++ new/kiconthemes-4.97.0/src/kiconeffect.cpp 2014-03-01 12:50:56.000000000 +0100 @@ -23,7 +23,7 @@ #include "kiconeffect.h" -#include <unistd.h> +#include <qplatformdefs.h> #include <math.h> #include <QSysInfo> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-4.96.0/src/kiconloader.cpp new/kiconthemes-4.97.0/src/kiconloader.cpp --- old/kiconthemes-4.96.0/src/kiconloader.cpp 2014-02-05 00:02:37.000000000 +0100 +++ new/kiconthemes-4.97.0/src/kiconloader.cpp 2014-03-01 12:50:56.000000000 +0100 @@ -24,10 +24,7 @@ #include "kiconloader.h" -#include <sys/types.h> -#include <stdlib.h> //for abs -#include <unistd.h> //for readlink -#include <dirent.h> +#include <qplatformdefs.h> //for readlink #include <assert.h> #include <QtCore/QCache> @@ -690,6 +687,8 @@ && !QFile::exists(*it + *it2 + "/index.theme")) { continue; } + //TODO: Is any special handling required for NTFS symlinks? +#ifndef Q_OS_WIN const int r = readlink(QFile::encodeName(*it + *it2), buf, sizeof(buf) - 1); if (r > 0) { buf[r] = 0; @@ -700,6 +699,7 @@ list.append(themeName); } } +#endif } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-4.96.0/src/kicontheme.cpp new/kiconthemes-4.97.0/src/kicontheme.cpp --- old/kiconthemes-4.96.0/src/kicontheme.cpp 2014-02-05 00:02:37.000000000 +0100 +++ new/kiconthemes-4.97.0/src/kicontheme.cpp 2014-03-01 12:50:56.000000000 +0100 @@ -23,9 +23,7 @@ #include "kicontheme.h" -#include <sys/stat.h> -#include <unistd.h> -#include <stdlib.h> +#include <qplatformdefs.h> #include <QAction> #include <QtCore/QCharRef> @@ -177,7 +175,7 @@ // Use KSharedConfig to avoid parsing the file many times, from each component. // Need to keep a ref to it to make this useful - d->sharedConfig = KSharedConfig::openConfig(fileName); + d->sharedConfig = KSharedConfig::openConfig(fileName, KConfig::NoGlobals); KConfigGroup cfg(d->sharedConfig, mainSection); d->mName = cfg.readEntry("Name"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-4.96.0/src/tools/kiconfinder/CMakeLists.txt new/kiconthemes-4.97.0/src/tools/kiconfinder/CMakeLists.txt --- old/kiconthemes-4.96.0/src/tools/kiconfinder/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kiconthemes-4.97.0/src/tools/kiconfinder/CMakeLists.txt 2014-03-01 12:50:56.000000000 +0100 @@ -0,0 +1,5 @@ +add_executable(kiconfinder5 kiconfinder.cpp) +ecm_mark_nongui_executable(kiconfinder5) +target_link_libraries(kiconfinder5 Qt5::Gui KF5IconThemes) + +install(TARGETS kiconfinder5 ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-4.96.0/src/tools/kiconfinder/kiconfinder.cpp new/kiconthemes-4.97.0/src/tools/kiconfinder/kiconfinder.cpp --- old/kiconthemes-4.96.0/src/tools/kiconfinder/kiconfinder.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kiconthemes-4.97.0/src/tools/kiconfinder/kiconfinder.cpp 2014-03-01 12:50:56.000000000 +0100 @@ -0,0 +1,50 @@ +/* This file is part of the KDE project + Copyright (C) 2008 David Faure <fa...@kde.org> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License or ( at + your option ) version 3 or, at the discretion of KDE e.V. ( which shall + act as a proxy as in section 14 of the GPLv3 ), any later version. + + This program 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 + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include <QGuiApplication> +#include <QCommandLineParser> +#include <kiconloader.h> +#include <../kiconthemes_version.h> + +int main(int argc, char *argv[]) +{ + QGuiApplication app(argc, argv); + app.setApplicationName("kiconfinder"); + app.setApplicationVersion(KICONTHEMES_VERSION_STRING); + QCommandLineParser parser; + parser.setApplicationDescription(app.translate("main", "Finds an icon based on its name")); + parser.addPositionalArgument("iconname", app.translate("main", "The icon name to look for")); + parser.addHelpOption(); + + parser.process(app); + if(parser.positionalArguments().isEmpty()) + parser.showHelp(); + + Q_FOREACH(const QString& iconName, parser.positionalArguments()) { + const QString icon = KIconLoader::global()->iconPath(iconName, KIconLoader::Desktop /*TODO configurable*/, true); + if ( !icon.isEmpty() ) { + printf("%s\n", icon.toLatin1().constData()); + } else { + return 1; // error + } + } + + return 0; +} -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
