Hello community, here is the log from the commit of package kiconthemes for openSUSE:Factory checked in at 2014-07-15 08:00:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-06-10 14:37:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiconthemes.new/kiconthemes.changes 2014-07-15 08:00:35.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Jul 11 09:48:44 UTC 2014 - [email protected] + +- Define kf5_version within package + +------------------------------------------------------------------- +Tue Jul 1 21:35:47 UTC 2014 - [email protected] + +- Update to 5.0.0 + * Final release of KDE Frameworks 5 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/kde-frameworks-5.0.php +- Drop 0001-Allow-passing-custom-theme-base-path-together-with-c.patch, + merged upstream + +------------------------------------------------------------------- Old: ---- 0001-Allow-passing-custom-theme-base-path-together-with-c.patch kiconthemes-4.100.0.tar.xz New: ---- kiconthemes-5.0.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiconthemes.spec ++++++ --- /var/tmp/diff_new_pack.iup4x8/_old 2014-07-15 08:00:36.000000000 +0200 +++ /var/tmp/diff_new_pack.iup4x8/_new 2014-07-15 08:00:36.000000000 +0200 @@ -18,16 +18,17 @@ %define lname libKF5IconThemes5 Name: kiconthemes -Version: 4.100.0 +Version: 5.0.0 Release: 0 +%define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.14 +BuildRequires: extra-cmake-modules >= 1.0.0 BuildRequires: fdupes -BuildRequires: kconfigwidgets-devel >= %{_kf5_version} +BuildRequires: kconfigwidgets-devel >= %{kf5_version} BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel >= %{_kf5_version} -BuildRequires: kitemviews-devel >= %{_kf5_version} -BuildRequires: kwidgetsaddons-devel >= %{_kf5_version} +BuildRequires: ki18n-devel >= %{kf5_version} +BuildRequires: kitemviews-devel >= %{kf5_version} +BuildRequires: kwidgetsaddons-devel >= %{kf5_version} BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 BuildRequires: pkgconfig(Qt5Svg) >= 5.2.0 @@ -37,10 +38,8 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/unstable/frameworks/%{version}/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{version}/%{name}-%{version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-UPSTREAM 0001-Allow-passing-custom-theme-base-path-together-with-c.patch -Patch0: 0001-Allow-passing-custom-theme-base-path-together-with-c.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,10 +60,10 @@ Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules -Requires: kconfigwidgets-devel >= %{_kf5_version} -Requires: ki18n-devel >= %{_kf5_version} -Requires: kitemviews-devel >= %{_kf5_version} -Requires: kwidgetsaddons-devel >= %{_kf5_version} +Requires: kconfigwidgets-devel >= %{kf5_version} +Requires: ki18n-devel >= %{kf5_version} +Requires: kitemviews-devel >= %{kf5_version} +Requires: kwidgetsaddons-devel >= %{kf5_version} Requires: pkgconfig(Qt5Widgets) >= 5.2.0 %description devel @@ -74,7 +73,6 @@ %lang_package -n %lname %prep %setup -q -%patch0 -p1 %build %cmake_kf5 -d build ++++++ kiconthemes-4.100.0.tar.xz -> kiconthemes-5.0.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-4.100.0/CMakeLists.txt new/kiconthemes-5.0.0/CMakeLists.txt --- old/kiconthemes-4.100.0/CMakeLists.txt 2014-06-01 14:20:21.000000000 +0200 +++ new/kiconthemes-5.0.0/CMakeLists.txt 2014-07-02 10:19:49.000000000 +0200 @@ -3,7 +3,7 @@ project(KIconThemes) # ECM setup -find_package(ECM 0.0.14 REQUIRED NO_MODULE) +find_package(ECM 1.0.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(KDEInstallDirs) @@ -15,8 +15,8 @@ include(ECMGenerateHeaders) include(ECMMarkNonGuiExecutable) -set(KF5_VERSION "4.100.0") # handled by release scripts -set(KF5_DEP_VERSION "4.100.0") # handled by release scripts +set(KF5_VERSION "5.0.0") # handled by release scripts +set(KF5_DEP_VERSION "5.0.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KICONTHEMES @@ -35,7 +35,6 @@ find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED) find_package(KF5ItemViews ${KF5_DEP_VERSION} REQUIRED) -remove_definitions(-DQT_NO_CAST_TO_ASCII) remove_definitions(-DQT_NO_CAST_FROM_ASCII) remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-4.100.0/po/ca/kiconthemes5.po new/kiconthemes-5.0.0/po/ca/kiconthemes5.po --- old/kiconthemes-4.100.0/po/ca/kiconthemes5.po 2014-06-01 14:20:21.000000000 +0200 +++ new/kiconthemes-5.0.0/po/ca/kiconthemes5.po 2014-07-02 10:19:49.000000000 +0200 @@ -1,5 +1,5 @@ # Translation of kiconthemes5.po to Catalan -# Copyright (C) 1998-2014 This_file_is_part_of_KDE +# Copyright (C) 2014 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # @@ -7,26 +7,26 @@ # Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. # Albert Astals Cid <[email protected]>, 2007. # Robert Millan <[email protected]>, 2009. -# Antoni Bella Pérez <[email protected]>, 2011, 2013. +# Antoni Bella Pérez <[email protected]>, 2011, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: kiconthemes5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-27 20:57+0000\n" -"PO-Revision-Date: 2014-01-18 09:26+0100\n" -"Last-Translator: Josep Ma. Ferrer <[email protected]>\n" +"PO-Revision-Date: 2014-06-25 17:59+0200\n" +"Last-Translator: Antoni Bella Pérez <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" #: kicondialog.cpp:240 kicondialog.cpp:250 kicondialog.cpp:589 msgid "Select Icon" -msgstr "Trieu icona" +msgstr "Trieu una icona" #: kicondialog.cpp:265 msgid "Icon Source" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-4.100.0/po/nds/kiconthemes5.po new/kiconthemes-5.0.0/po/nds/kiconthemes5.po --- old/kiconthemes-4.100.0/po/nds/kiconthemes5.po 2014-06-01 14:20:21.000000000 +0200 +++ new/kiconthemes-5.0.0/po/nds/kiconthemes5.po 2014-07-02 10:19:49.000000000 +0200 @@ -17,7 +17,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: kicondialog.cpp:240 kicondialog.cpp:250 kicondialog.cpp:589 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-4.100.0/po/sr/kiconthemes5.po new/kiconthemes-5.0.0/po/sr/kiconthemes5.po --- old/kiconthemes-4.100.0/po/sr/kiconthemes5.po 2014-06-01 14:20:21.000000000 +0200 +++ new/kiconthemes-5.0.0/po/sr/kiconthemes5.po 2014-07-02 10:19:49.000000000 +0200 @@ -19,8 +19,8 @@ "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -"X-Associated-UI-Catalogs: desktop_applications_kde-baseapps " -"desktop_workspace_systemsettings kdelibs4\n" +"X-Associated-UI-Catalogs: kde-baseapps.desktop systemsettings.desktop " +"kdelibs4\n" "X-Environment: kde\n" "X-Wrapping: fine\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-4.100.0/po/sr@ijekavian/kiconthemes5.po new/kiconthemes-5.0.0/po/sr@ijekavian/kiconthemes5.po --- old/kiconthemes-4.100.0/po/sr@ijekavian/kiconthemes5.po 2014-06-01 14:20:21.000000000 +0200 +++ new/kiconthemes-5.0.0/po/sr@ijekavian/kiconthemes5.po 2014-07-02 10:19:49.000000000 +0200 @@ -19,8 +19,8 @@ "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -"X-Associated-UI-Catalogs: desktop_applications_kde-baseapps " -"desktop_workspace_systemsettings kdelibs4\n" +"X-Associated-UI-Catalogs: kde-baseapps.desktop systemsettings.desktop " +"kdelibs4\n" "X-Environment: kde\n" # >> @title:window diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-4.100.0/po/sr@ijekavianlatin/kiconthemes5.po new/kiconthemes-5.0.0/po/sr@ijekavianlatin/kiconthemes5.po --- old/kiconthemes-4.100.0/po/sr@ijekavianlatin/kiconthemes5.po 2014-06-01 14:20:21.000000000 +0200 +++ new/kiconthemes-5.0.0/po/sr@ijekavianlatin/kiconthemes5.po 2014-07-02 10:19:49.000000000 +0200 @@ -19,8 +19,8 @@ "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -"X-Associated-UI-Catalogs: desktop_applications_kde-baseapps " -"desktop_workspace_systemsettings kdelibs4\n" +"X-Associated-UI-Catalogs: kde-baseapps.desktop systemsettings.desktop " +"kdelibs4\n" "X-Environment: kde\n" # >> @title:window diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-4.100.0/po/sr@latin/kiconthemes5.po new/kiconthemes-5.0.0/po/sr@latin/kiconthemes5.po --- old/kiconthemes-4.100.0/po/sr@latin/kiconthemes5.po 2014-06-01 14:20:21.000000000 +0200 +++ new/kiconthemes-5.0.0/po/sr@latin/kiconthemes5.po 2014-07-02 10:19:49.000000000 +0200 @@ -19,8 +19,8 @@ "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -"X-Associated-UI-Catalogs: desktop_applications_kde-baseapps " -"desktop_workspace_systemsettings kdelibs4\n" +"X-Associated-UI-Catalogs: kde-baseapps.desktop systemsettings.desktop " +"kdelibs4\n" "X-Environment: kde\n" # >> @title:window diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-4.100.0/po/uk/kiconthemes5.po new/kiconthemes-5.0.0/po/uk/kiconthemes5.po --- old/kiconthemes-4.100.0/po/uk/kiconthemes5.po 2014-06-01 14:20:21.000000000 +0200 +++ new/kiconthemes-5.0.0/po/uk/kiconthemes5.po 2014-07-02 10:19:49.000000000 +0200 @@ -1,12 +1,15 @@ -# translation of kio4.po to Ukrainian -# Translation of kio4.po to Ukrainian +# Translation of kiconthemes5.po to Ukrainian +# Copyright (C) 2014 This_file_is_part_of_KDE +# This file is distributed under the license LGPL version 2.1 or +# version 3 or later versions approved by the membership of KDE e.V. +# # Andriy Rysin <[email protected]>, 2000, 2002, 2003, 2006, 2007. # Eugene Onischenko <[email protected]>, 2002, 2003, 2004, 2005. # Ivan Petrouchtchak <[email protected]>, 2005, 2006, 2007, 2008. # Yuri Chornoivan <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2013. msgid "" msgstr "" -"Project-Id-Version: kio4\n" +"Project-Id-Version: kiconthemes5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-27 20:57+0000\n" "PO-Revision-Date: 2013-11-19 19:40+0200\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-4.100.0/src/kiconloader.cpp new/kiconthemes-5.0.0/src/kiconloader.cpp --- old/kiconthemes-4.100.0/src/kiconloader.cpp 2014-06-01 14:20:21.000000000 +0200 +++ new/kiconthemes-5.0.0/src/kiconloader.cpp 2014-07-02 10:19:49.000000000 +0200 @@ -202,7 +202,7 @@ * @internal * Adds themes installed in the application's directory. **/ - void addAppThemes(const QString &appname); + void addAppThemes(const QString &appname, const QString &themeBaseDir = QString()); /** * @internal @@ -576,28 +576,28 @@ return d->searchPaths; } -void KIconLoader::addAppDir(const QString &appname) +void KIconLoader::addAppDir(const QString &appname, const QString &themeBaseDir) { d->initIconThemes(); d->searchPaths.append(appname + "/pics"); - d->addAppThemes(appname); + d->addAppThemes(appname, themeBaseDir); } -void KIconLoaderPrivate::addAppThemes(const QString &appname) +void KIconLoaderPrivate::addAppThemes(const QString &appname, const QString &themeBaseDir) { initIconThemes(); - KIconTheme *def = new KIconTheme(KIconTheme::current(), appname); + KIconTheme *def = new KIconTheme("hicolor", appname, themeBaseDir); if (!def->isValid()) { delete def; - def = new KIconTheme(KIconTheme::defaultThemeName(), appname); + def = new KIconTheme(KIconTheme::defaultThemeName(), appname, themeBaseDir); } KIconThemeNode *node = new KIconThemeNode(def); bool addedToLinks = false; - if (!mThemesInTree.contains(node->theme->internalName())) { - mThemesInTree.append(node->theme->internalName()); + if (!mThemesInTree.contains(appname)) { + mThemesInTree.append(appname); links.append(node); addedToLinks = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-4.100.0/src/kiconloader.h new/kiconthemes-5.0.0/src/kiconloader.h --- old/kiconthemes-4.100.0/src/kiconloader.h 2014-06-01 14:20:21.000000000 +0200 +++ new/kiconthemes-5.0.0/src/kiconloader.h 2014-07-02 10:19:49.000000000 +0200 @@ -199,10 +199,14 @@ static KIconLoader *global(); /** - * Adds @p appname to the list of application specific directories. + * Adds @p appname to the list of application specific directories with @p themeBaseDir as its base directory. + * Assume the icons are in /home/user/app/icons/hicolor/48x48/my_app.png, the base directory would be + * /home/user/app/icons; KIconLoader automatically searches @p themeBaseDir + "/hicolor" + * This directory must contain a dir structure as defined by the XDG icons specification * @param appname The application name. + * @param themeBaseDir The base directory of the application's theme (eg. "/home/user/app/icons") */ - void addAppDir(const QString &appname); + void addAppDir(const QString &appname, const QString &themeBaseDir = QString()); /** * Loads an icon. It will try very hard to find an icon which is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-4.100.0/src/kicontheme.cpp new/kiconthemes-5.0.0/src/kicontheme.cpp --- old/kiconthemes-4.100.0/src/kicontheme.cpp 2014-06-01 14:20:21.000000000 +0200 +++ new/kiconthemes-5.0.0/src/kicontheme.cpp 2014-07-02 10:19:49.000000000 +0200 @@ -115,7 +115,9 @@ QString mBaseDirThemeDir; }; -KIconTheme::KIconTheme(const QString &name, const QString &appName) + + +KIconTheme::KIconTheme(const QString &name, const QString &appName, const QString &basePathHint) : d(new KIconThemePrivate) { @@ -137,6 +139,11 @@ themeDirs += cDir + '/'; } } + + if (!basePathHint.isEmpty()) { + // Checks for dir existing are done below + themeDirs += basePathHint + '/' + name + '/'; + } } // Find the theme description file. These are always global. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-4.100.0/src/kicontheme.h new/kiconthemes-5.0.0/src/kicontheme.h --- old/kiconthemes-4.100.0/src/kicontheme.h 2014-06-01 14:20:21.000000000 +0200 +++ new/kiconthemes-5.0.0/src/kicontheme.h 2014-07-02 10:19:49.000000000 +0200 @@ -50,8 +50,10 @@ * @param name the name of the theme (e.g. "hicolor" or "keramik") * @param appName the name of the application. Can be null. This argument * allows applications to have themed application icons. + * @param basePathHint optional hint where to search the app themes. + * This is appended at the end of the search paths */ - explicit KIconTheme(const QString &name, const QString &appName = QString()); + explicit KIconTheme(const QString &name, const QString &appName = QString(), const QString &basePathHint = QString()); ~KIconTheme(); /** -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
