Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kiconthemes for openSUSE:Factory checked in at 2022-01-11 21:16:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiconthemes (Old) and /work/SRC/openSUSE:Factory/.kiconthemes.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiconthemes" Tue Jan 11 21:16:23 2022 rev:104 rq:945060 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kiconthemes/kiconthemes.changes 2021-12-13 20:44:17.532484313 +0100 +++ /work/SRC/openSUSE:Factory/.kiconthemes.new.1892/kiconthemes.changes 2022-01-11 21:19:00.788948004 +0100 @@ -1,0 +2,12 @@ +Mon Jan 3 12:47:36 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 5.90.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.90.0 +- Changes since 5.89.0: + * KIconColors: add Complement and Contrast + * KIconColors: add .ColorScheme-ActiveText + * WIP: Change the build system to enable building with Qt 6 + +------------------------------------------------------------------- Old: ---- kiconthemes-5.89.0.tar.xz kiconthemes-5.89.0.tar.xz.sig New: ---- kiconthemes-5.90.0.tar.xz kiconthemes-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiconthemes.spec ++++++ --- /var/tmp/diff_new_pack.iQLPRT/_old 2022-01-11 21:19:01.352948401 +0100 +++ /var/tmp/diff_new_pack.iQLPRT/_new 2022-01-11 21:19:01.368948412 +0100 @@ -17,21 +17,21 @@ %define lname libKF5IconThemes5 -%define _tar_path 5.89 +%define _tar_path 5.90 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} -%bcond_without lang +%bcond_without released Name: kiconthemes -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: Icon GUI utilities License: LGPL-2.1-or-later AND GPL-2.0-or-later Group: System/GUI/KDE URL: https://www.kde.org Source: %{name}-%{version}.tar.xz -%if %{with lang} +%if %{with released} Source1: %{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif @@ -58,7 +58,6 @@ %package -n %{lname} Summary: Icon GUI utilities Group: System/GUI/KDE -Recommends: %{lname}-lang = %{version} %if %pkg_vcmp cmake(Qt5Core) >= 5.12.0 # Used as fallback icon theme starting with Qt 5.12 Recommends: breeze5-icons @@ -92,14 +91,14 @@ %kf5_makeinstall -C build %fdupes %{buildroot} -%if %{with lang} +%if %{with released} %find_lang %{name}5 %endif %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig -%if %{with lang} +%if %{with released} %files -n %{lname}-lang -f %{name}5.lang %endif ++++++ kiconthemes-5.89.0.tar.xz -> kiconthemes-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/CMakeLists.txt new/kiconthemes-5.90.0/CMakeLists.txt --- old/kiconthemes-5.89.0/CMakeLists.txt 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/CMakeLists.txt 2022-01-01 13:31:29.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.89.0") # handled by release scripts -set(KF_DEP_VERSION "5.89.0") # handled by release scripts +set(KF_VERSION "5.90.0") # handled by release scripts +set(KF_DEP_VERSION "5.90.0") # handled by release scripts project(KIconThemes VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.89.0 NO_MODULE) +find_package(ECM 5.90.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -40,10 +40,10 @@ # Dependencies set(REQUIRED_QT_VERSION 5.15.2) -find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) -find_package(Qt5Svg ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) +find_package(Qt${QT_MAJOR_VERSION}Widgets ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) +find_package(Qt${QT_MAJOR_VERSION}Svg ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) if (NOT ANDROID) - find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) + find_package(Qt${QT_MAJOR_VERSION}DBus ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) endif() find_package(KF5Archive ${KF_DEP_VERSION} REQUIRED) @@ -56,7 +56,7 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055900) add_definitions(-DTRANSLATION_DOMAIN=\"kiconthemes5\") ki18n_install(po) @@ -98,7 +98,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kiconthemes_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel ) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/KF5IconThemesConfig.cmake.in new/kiconthemes-5.90.0/KF5IconThemesConfig.cmake.in --- old/kiconthemes-5.89.0/KF5IconThemesConfig.cmake.in 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/KF5IconThemesConfig.cmake.in 2022-01-01 13:31:29.000000000 +0100 @@ -1,14 +1,14 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(Qt5Widgets "@REQUIRED_QT_VERSION@") +find_dependency(Qt@QT_MAJOR_VERSION@Widgets "@REQUIRED_QT_VERSION@") if (NOT @BUILD_SHARED_LIBS@) - find_dependency(Qt5Widgets "@REQUIRED_QT_VERSION@") - find_dependency(Qt5Svg "@REQUIRED_QT_VERSION@") + find_dependency(Qt@QT_MAJOR_VERSION@Widgets "@REQUIRED_QT_VERSION@") + find_dependency(Qt@QT_MAJOR_VERSION@Svg "@REQUIRED_QT_VERSION@") if (NOT ANDROID) - find_dependency(Qt5DBus "@REQUIRED_QT_VERSION@") + find_dependency(Qt@QT_MAJOR_VERSION@DBus "@REQUIRED_QT_VERSION@") endif() find_dependency(KF5Archive "@KF_DEP_VERSION@") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/autotests/CMakeLists.txt new/kiconthemes-5.90.0/autotests/CMakeLists.txt --- old/kiconthemes-5.89.0/autotests/CMakeLists.txt 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:31:29.000000000 +0100 @@ -1,5 +1,5 @@ -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) include(ECMAddTests) @@ -7,7 +7,7 @@ foreach(_testname ${ARGN}) set(_srcs ${_testname}.cpp) qt_add_resources(_srcs resources.qrc) - ecm_add_test(${_srcs} TEST_NAME ${_testname} LINK_LIBRARIES Qt5::Test KF5::IconThemes KF5::WidgetsAddons KF5::ConfigCore) + ecm_add_test(${_srcs} TEST_NAME ${_testname} LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::IconThemes KF5::WidgetsAddons KF5::ConfigCore) endforeach(_testname) endmacro() @@ -22,16 +22,16 @@ ### Test for RCC loading -get_target_property(QT_RCC_EXECUTABLE Qt5::rcc LOCATION) +get_target_property(QT_RCC_EXECUTABLE Qt${QT_MAJOR_VERSION}::rcc LOCATION) add_custom_command(OUTPUT icontheme.rcc COMMAND ${QT_RCC_EXECUTABLE} --binary -o icontheme.rcc ${CMAKE_CURRENT_SOURCE_DIR}/icontheme.qrc DEPENDS icontheme.qrc ) -ecm_add_test(kiconloader_rcctest.cpp LINK_LIBRARIES Qt5::Test KF5::IconThemes KF5::WidgetsAddons KF5::ConfigCore) +ecm_add_test(kiconloader_rcctest.cpp LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::IconThemes KF5::WidgetsAddons KF5::ConfigCore) add_custom_target(rcctest-rcc ALL DEPENDS icontheme.rcc) # a custom target that is always built set_tests_properties(kiconloader_unittest PROPERTIES RUN_SERIAL TRUE) # Benchmark, compiled, but not run automatically with ctest add_executable(kiconloader_benchmark kiconloader_benchmark.cpp) -target_link_libraries(kiconloader_benchmark Qt5::Test KF5::IconThemes KF5::WidgetsAddons KF5::ConfigCore) +target_link_libraries(kiconloader_benchmark Qt${QT_MAJOR_VERSION}::Test KF5::IconThemes KF5::WidgetsAddons KF5::ConfigCore) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/po/ar/kiconthemes5.po new/kiconthemes-5.90.0/po/ar/kiconthemes5.po --- old/kiconthemes-5.89.0/po/ar/kiconthemes5.po 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/po/ar/kiconthemes5.po 2022-01-01 13:31:29.000000000 +0100 @@ -12,23 +12,23 @@ # ???????? ?????? Mohamed SAAD <[email protected]>, 2006. # Youssef Chahibi <[email protected]>, 2007. # zayed <[email protected]>, 2008, 2009. -# Zayed Al-Saidi <[email protected]>, 2009. +# Zayed Al-Saidi <[email protected]>, 2009, 2021. # Safa Alfulaij <[email protected]>, 2013, 2018. msgid "" msgstr "" "Project-Id-Version: kio4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-11-30 00:41+0000\n" -"PO-Revision-Date: 2018-06-09 20:24+0300\n" -"Last-Translator: Safa Alfulaij <[email protected]>\n" -"Language-Team: Arabic <[email protected]>\n" +"PO-Revision-Date: 2021-12-08 19:07+0400\n" +"Last-Translator: Zayed Al-Saidi <[email protected]>\n" +"Language-Team: ar\n" "Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 21.07.70\n" #: kicondialog.cpp:312 msgid "All" @@ -71,28 +71,25 @@ msgstr "????????????" #: kicondialog.cpp:345 -#, fuzzy, kde-format -#| msgctxt "@item:inmenu" -#| msgid "Other" +#, kde-format msgctxt "Other icons" msgid "Other" msgstr "????????" #: kicondialog.cpp:392 -#, fuzzy, kde-format -#| msgid "&Browse..." +#, kde-format msgid "Browse???" -msgstr "??&???????????" +msgstr "?????????????" #: kicondialog.cpp:594 #, kde-format msgid "No icons matching the search" -msgstr "" +msgstr "???? ???????? ?????????????? ???????????? ??????????" #: kicondialog.cpp:596 #, kde-format msgid "No icons in this category" -msgstr "" +msgstr "???? ???????? ?????????????? ???? ?????? ??????????" #. i18n: ectx: property (windowTitle), widget (QWidget, IconDialog) #: kicondialog.cpp:676 kicondialog.ui:14 @@ -101,21 +98,21 @@ msgstr "???????? ????????????????" #: kicondialog.cpp:676 -#, fuzzy, kde-format -#| msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)" +#, kde-format msgid "" "*.ico *.png *.xpm *.svg *.svgz|Icon Files (*.ico *.png *.xpm *.svg *.svgz)" -msgstr "*.png *.xpm *.svg *.svgz|?????????? ?????????????????? (*.png *.xpm *.svg *.svgz)" +msgstr "" +"*.ico *.png *.xpm *.svg *.svgz | ?????????? ?????????????????? (*.ico *.png *.xpm *.svg *." +"svgz)" #. i18n: ectx: property (accessibleName), widget (QComboBox, contextCombo) #: kicondialog.ui:24 #, kde-format msgid "Icon category" -msgstr "" +msgstr "?????? ????????????????" #. i18n: ectx: property (placeholderText), widget (QLineEdit, searchLine) #: kicondialog.ui:44 -#, fuzzy, kde-format -#| msgid "Select Icon" +#, kde-format msgid "Search Icons..." -msgstr "???????? ????????????????" +msgstr "???????? ????????????????..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/po/ca@valencia/kiconthemes5.po new/kiconthemes-5.90.0/po/ca@valencia/kiconthemes5.po --- old/kiconthemes-5.89.0/po/ca@valencia/kiconthemes5.po 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/po/ca@valencia/kiconthemes5.po 2022-01-01 13:31:29.000000000 +0100 @@ -1,26 +1,26 @@ # Translation of kiconthemes5.po to Catalan (Valencian) -# Copyright (C) 1998-2018 This_file_is_part_of_KDE +# Copyright (C) 1998-2021 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. # # Sebasti?? Pla i Sanz <[email protected]>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006. -# Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2018. +# Josep M. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2018. # Albert Astals Cid <[email protected]>, 2007. # Robert Millan <[email protected]>, 2009. -# Antoni Bella P??rez <[email protected]>, 2011, 2013, 2014. +# Antoni Bella P??rez <[email protected]>, 2011, 2013, 2014, 2021. msgid "" msgstr "" "Project-Id-Version: kiconthemes\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-11-30 00:41+0000\n" -"PO-Revision-Date: 2018-06-28 20:04+0100\n" -"Last-Translator: Josep Ma. Ferrer <[email protected]>\n" +"PO-Revision-Date: 2021-07-06 10:38+0200\n" +"Last-Translator: Antoni Bella P??rez <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 21.04.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" @@ -68,23 +68,22 @@ #, kde-format msgctxt "Other icons" msgid "Other" -msgstr "" +msgstr "Altres" #: kicondialog.cpp:392 -#, fuzzy, kde-format -#| msgid "&Browse..." +#, kde-format msgid "Browse???" -msgstr "&Navega..." +msgstr "Navega???" #: kicondialog.cpp:594 #, kde-format msgid "No icons matching the search" -msgstr "" +msgstr "No hi ha cap icona que coincidisca amb la cerca" #: kicondialog.cpp:596 #, kde-format msgid "No icons in this category" -msgstr "" +msgstr "No hi ha cap icona en aquesta categoria" #. i18n: ectx: property (windowTitle), widget (QWidget, IconDialog) #: kicondialog.cpp:676 kicondialog.ui:14 @@ -104,11 +103,10 @@ #: kicondialog.ui:24 #, kde-format msgid "Icon category" -msgstr "" +msgstr "Categoria d'icones" #. i18n: ectx: property (placeholderText), widget (QLineEdit, searchLine) #: kicondialog.ui:44 -#, fuzzy, kde-format -#| msgid "Select Icon" +#, kde-format msgid "Search Icons..." -msgstr "Trieu una icona" +msgstr "Cerca les icones..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/po/fr/kiconthemes5.po new/kiconthemes-5.90.0/po/fr/kiconthemes5.po --- old/kiconthemes-5.89.0/po/fr/kiconthemes5.po 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/po/fr/kiconthemes5.po 2022-01-01 13:31:29.000000000 +0100 @@ -21,7 +21,7 @@ "Project-Id-Version: kio4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-11-30 00:41+0000\n" -"PO-Revision-Date: 2021-07-07 09:16+0200\n" +"PO-Revision-Date: 2021-12-27 22:50+0100\n" "Last-Translator: Xavier Besnard <[email protected]>\n" "Language-Team: French <[email protected]>\n" "Language: fr\n" @@ -29,7 +29,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 21.04.2\n" +"X-Generator: Lokalize 21.12.0\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" @@ -88,12 +88,12 @@ #: kicondialog.cpp:594 #, kde-format msgid "No icons matching the search" -msgstr "Aucun ic??ne correspondant ?? la recherche" +msgstr "Aucune ic??ne correspondant ?? la recherche" #: kicondialog.cpp:596 #, kde-format msgid "No icons in this category" -msgstr "Aucun ic??ne dans cette cat??gorie" +msgstr "Aucune ic??ne dans cette cat??gorie" #. i18n: ectx: property (windowTitle), widget (QWidget, IconDialog) #: kicondialog.cpp:676 kicondialog.ui:14 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/po/hu/kiconthemes5.po new/kiconthemes-5.90.0/po/hu/kiconthemes5.po --- old/kiconthemes-5.89.0/po/hu/kiconthemes5.po 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/po/hu/kiconthemes5.po 2022-01-01 13:31:29.000000000 +0100 @@ -1,20 +1,20 @@ # Krist??f Kiszel <[email protected]>, 2010, 2011, 2012. # Bal??zs ??r <[email protected]>, 2012. -# Kristof Kiszel <[email protected]>, 2018. +# Kristof Kiszel <[email protected]>, 2018, 2021. msgid "" msgstr "" "Project-Id-Version: KDE 4.4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-11-30 00:41+0000\n" -"PO-Revision-Date: 2018-09-29 16:40+0200\n" -"Last-Translator: Kristof Kiszel <[email protected]>\n" +"PO-Revision-Date: 2021-12-29 17:43+0100\n" +"Last-Translator: Kristof Kiszel <[email protected]>\n" "Language-Team: Hungarian <[email protected]>\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 21.12.0\n" #: kicondialog.cpp:312 msgid "All" @@ -57,28 +57,25 @@ msgstr "??llapot" #: kicondialog.cpp:345 -#, fuzzy, kde-format -#| msgctxt "@item:inmenu" -#| msgid "Other" +#, kde-format msgctxt "Other icons" msgid "Other" msgstr "Egy??b" #: kicondialog.cpp:392 -#, fuzzy, kde-format -#| msgid "&Browse..." +#, kde-format msgid "Browse???" -msgstr "&Tall??z??s..." +msgstr "B??ng??sz??s???" #: kicondialog.cpp:594 #, kde-format msgid "No icons matching the search" -msgstr "" +msgstr "Nincsenek a keres??sre illeszked?? ikonok" #: kicondialog.cpp:596 #, kde-format msgid "No icons in this category" -msgstr "" +msgstr "Nincsenek ikonok ebben a kateg??ri??ban" #. i18n: ectx: property (windowTitle), widget (QWidget, IconDialog) #: kicondialog.cpp:676 kicondialog.ui:14 @@ -97,11 +94,10 @@ #: kicondialog.ui:24 #, kde-format msgid "Icon category" -msgstr "" +msgstr "Ikonkateg??ria" #. i18n: ectx: property (placeholderText), widget (QLineEdit, searchLine) #: kicondialog.ui:44 -#, fuzzy, kde-format -#| msgid "Select Icon" +#, kde-format msgid "Search Icons..." -msgstr "Ikonv??laszt??s" +msgstr "Ikonok keres??se???" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/po/nb/kiconthemes5.po new/kiconthemes-5.90.0/po/nb/kiconthemes5.po --- old/kiconthemes-5.89.0/po/nb/kiconthemes5.po 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/po/nb/kiconthemes5.po 2022-01-01 13:31:29.000000000 +0100 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: kio4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-11-27 00:25+0000\n" +"POT-Creation-Date: 2021-11-30 00:41+0000\n" "PO-Revision-Date: 2012-12-30 20:55+0100\n" "Last-Translator: Bj??rn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokm??l <[email protected]>\n" @@ -29,74 +29,74 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: kicondialog.cpp:309 +#: kicondialog.cpp:312 msgid "All" msgstr "" -#: kicondialog.cpp:310 +#: kicondialog.cpp:313 msgid "Actions" msgstr "Handlinger" -#: kicondialog.cpp:311 +#: kicondialog.cpp:314 msgid "Applications" msgstr "Programmer" -#: kicondialog.cpp:312 +#: kicondialog.cpp:315 msgid "Categories" msgstr "Kategorier" -#: kicondialog.cpp:313 +#: kicondialog.cpp:316 msgid "Devices" msgstr "Enheter" -#: kicondialog.cpp:314 +#: kicondialog.cpp:317 msgid "Emblems" msgstr "Emblemer" -#: kicondialog.cpp:315 +#: kicondialog.cpp:318 msgid "Emotes" msgstr "Emotikoner" -#: kicondialog.cpp:316 +#: kicondialog.cpp:319 msgid "Mimetypes" msgstr "Mime-typer" -#: kicondialog.cpp:317 +#: kicondialog.cpp:320 msgid "Places" msgstr "Steder" -#: kicondialog.cpp:318 +#: kicondialog.cpp:321 msgid "Status" msgstr "Status" -#: kicondialog.cpp:342 +#: kicondialog.cpp:345 #, kde-format msgctxt "Other icons" msgid "Other" msgstr "" -#: kicondialog.cpp:389 +#: kicondialog.cpp:392 #, kde-format msgid "Browse???" msgstr "" -#: kicondialog.cpp:591 +#: kicondialog.cpp:594 #, kde-format msgid "No icons matching the search" msgstr "" -#: kicondialog.cpp:593 +#: kicondialog.cpp:596 #, kde-format msgid "No icons in this category" msgstr "" #. i18n: ectx: property (windowTitle), widget (QWidget, IconDialog) -#: kicondialog.cpp:673 kicondialog.ui:14 +#: kicondialog.cpp:676 kicondialog.ui:14 #, kde-format msgid "Select Icon" msgstr "Velg ikon" -#: kicondialog.cpp:673 +#: kicondialog.cpp:676 #, kde-format msgid "" "*.ico *.png *.xpm *.svg *.svgz|Icon Files (*.ico *.png *.xpm *.svg *.svgz)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/po/nn/kiconthemes5.po new/kiconthemes-5.90.0/po/nn/kiconthemes5.po --- old/kiconthemes-5.89.0/po/nn/kiconthemes5.po 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/po/nn/kiconthemes5.po 2022-01-01 13:31:29.000000000 +0100 @@ -4,92 +4,93 @@ # H??vard Korsvoll <[email protected]>, 2003. # Karl Ove Hufthammer <[email protected]>, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2018. # Eirik U. Birkeland <[email protected]>, 2008, 2009, 2010. +# Oystein Steffensen-Alvaervik <[email protected]>, 2021. msgid "" msgstr "" "Project-Id-Version: kio4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-11-27 00:25+0000\n" -"PO-Revision-Date: 2018-07-04 13:39+0100\n" -"Last-Translator: Karl Ove Hufthammer <[email protected]>\n" +"POT-Creation-Date: 2021-11-30 00:41+0000\n" +"PO-Revision-Date: 2021-12-15 13:30+0100\n" +"Last-Translator: Oystein Steffensen-Alvaervik <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" "Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 21.12.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: kicondialog.cpp:309 +#: kicondialog.cpp:312 msgid "All" msgstr "Alle" -#: kicondialog.cpp:310 +#: kicondialog.cpp:313 msgid "Actions" msgstr "Handlingar" -#: kicondialog.cpp:311 +#: kicondialog.cpp:314 msgid "Applications" msgstr "Program" -#: kicondialog.cpp:312 +#: kicondialog.cpp:315 msgid "Categories" msgstr "Kategoriar" -#: kicondialog.cpp:313 +#: kicondialog.cpp:316 msgid "Devices" msgstr "Einingar" -#: kicondialog.cpp:314 +#: kicondialog.cpp:317 msgid "Emblems" msgstr "Emblem" -#: kicondialog.cpp:315 +#: kicondialog.cpp:318 msgid "Emotes" msgstr "Fjesingar" -#: kicondialog.cpp:316 +#: kicondialog.cpp:319 msgid "Mimetypes" msgstr "MIME-typar" -#: kicondialog.cpp:317 +#: kicondialog.cpp:320 msgid "Places" msgstr "Stadar" -#: kicondialog.cpp:318 +#: kicondialog.cpp:321 msgid "Status" msgstr "Status" -#: kicondialog.cpp:342 +#: kicondialog.cpp:345 #, kde-format msgctxt "Other icons" msgid "Other" -msgstr "" +msgstr "Anna" -#: kicondialog.cpp:389 +#: kicondialog.cpp:392 #, kde-format msgid "Browse???" -msgstr "" +msgstr "Bla gjennom?????" -#: kicondialog.cpp:591 +#: kicondialog.cpp:594 #, kde-format msgid "No icons matching the search" -msgstr "" +msgstr "Ingen ikon i samsvar med s??ket" -#: kicondialog.cpp:593 +#: kicondialog.cpp:596 #, kde-format msgid "No icons in this category" -msgstr "" +msgstr "Ingen ikon i denne kategorien" #. i18n: ectx: property (windowTitle), widget (QWidget, IconDialog) -#: kicondialog.cpp:673 kicondialog.ui:14 +#: kicondialog.cpp:676 kicondialog.ui:14 #, kde-format msgid "Select Icon" msgstr "Vel ikon" -#: kicondialog.cpp:673 +#: kicondialog.cpp:676 #, kde-format msgid "" "*.ico *.png *.xpm *.svg *.svgz|Icon Files (*.ico *.png *.xpm *.svg *.svgz)" @@ -100,10 +101,10 @@ #: kicondialog.ui:24 #, kde-format msgid "Icon category" -msgstr "" +msgstr "Ikonkategori" #. i18n: ectx: property (placeholderText), widget (QLineEdit, searchLine) #: kicondialog.ui:44 #, kde-format msgid "Search Icons..." -msgstr "" +msgstr "S??k blant ikon?????" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/po/se/kiconthemes5.po new/kiconthemes-5.90.0/po/se/kiconthemes5.po --- old/kiconthemes-5.89.0/po/se/kiconthemes5.po 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/po/se/kiconthemes5.po 2022-01-01 13:31:29.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kio4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-11-27 00:25+0000\n" +"POT-Creation-Date: 2021-11-30 00:41+0000\n" "PO-Revision-Date: 2012-06-03 01:00+0200\n" "Last-Translator: B??rre Gaup <[email protected]>\n" "Language-Team: Northern Sami <[email protected]>\n" @@ -19,74 +19,74 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: kicondialog.cpp:309 +#: kicondialog.cpp:312 msgid "All" msgstr "Buot" -#: kicondialog.cpp:310 +#: kicondialog.cpp:313 msgid "Actions" msgstr "Doaimmat" -#: kicondialog.cpp:311 +#: kicondialog.cpp:314 msgid "Applications" msgstr "Progr??mmat" -#: kicondialog.cpp:312 +#: kicondialog.cpp:315 msgid "Categories" msgstr "L??git" -#: kicondialog.cpp:313 +#: kicondialog.cpp:316 msgid "Devices" msgstr "Ovttadagat" -#: kicondialog.cpp:314 +#: kicondialog.cpp:317 msgid "Emblems" msgstr "Emblemat" -#: kicondialog.cpp:315 +#: kicondialog.cpp:318 msgid "Emotes" msgstr "Moj??nat" -#: kicondialog.cpp:316 +#: kicondialog.cpp:319 msgid "Mimetypes" msgstr "MIME-??l??jat" -#: kicondialog.cpp:317 +#: kicondialog.cpp:320 msgid "Places" msgstr "B??ikkit" -#: kicondialog.cpp:318 +#: kicondialog.cpp:321 msgid "Status" msgstr "St??htus" -#: kicondialog.cpp:342 +#: kicondialog.cpp:345 #, kde-format msgctxt "Other icons" msgid "Other" msgstr "" -#: kicondialog.cpp:389 +#: kicondialog.cpp:392 #, kde-format msgid "Browse???" msgstr "" -#: kicondialog.cpp:591 +#: kicondialog.cpp:594 #, kde-format msgid "No icons matching the search" msgstr "" -#: kicondialog.cpp:593 +#: kicondialog.cpp:596 #, kde-format msgid "No icons in this category" msgstr "" #. i18n: ectx: property (windowTitle), widget (QWidget, IconDialog) -#: kicondialog.cpp:673 kicondialog.ui:14 +#: kicondialog.cpp:676 kicondialog.ui:14 #, kde-format msgid "Select Icon" msgstr "V??llje gova??a" -#: kicondialog.cpp:673 +#: kicondialog.cpp:676 #, kde-format msgid "" "*.ico *.png *.xpm *.svg *.svgz|Icon Files (*.ico *.png *.xpm *.svg *.svgz)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/po/zh_CN/kiconthemes5.po new/kiconthemes-5.90.0/po/zh_CN/kiconthemes5.po --- old/kiconthemes-5.89.0/po/zh_CN/kiconthemes5.po 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/po/zh_CN/kiconthemes5.po 2022-01-01 13:31:29.000000000 +0100 @@ -17,7 +17,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-11-30 00:41+0000\n" -"PO-Revision-Date: 2021-11-30 15:21\n" +"PO-Revision-Date: 2021-12-22 14:05\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/src/CMakeLists.txt new/kiconthemes-5.90.0/src/CMakeLists.txt --- old/kiconthemes-5.89.0/src/CMakeLists.txt 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/src/CMakeLists.txt 2022-01-01 13:31:29.000000000 +0100 @@ -49,13 +49,13 @@ EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) -target_include_directories(KF5IconThemes INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KIconThemes>") +target_include_directories(KF5IconThemes INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KIconThemes>") target_link_libraries(KF5IconThemes PUBLIC - Qt5::Widgets + Qt${QT_MAJOR_VERSION}::Widgets PRIVATE - Qt5::Svg + Qt${QT_MAJOR_VERSION}::Svg KF5::Archive # for KCompressionDevice KF5::I18n # for i18n in KIconDialog KF5::WidgetsAddons # for KPixmapSequence family @@ -63,8 +63,8 @@ KF5::ConfigWidgets # for KColorScheme KF5::CoreAddons # for kshareddatacache.h ) -if (TARGET Qt5::DBus) - target_link_libraries(KF5IconThemes PRIVATE Qt5::DBus) +if (TARGET Qt${QT_MAJOR_VERSION}::DBus) + target_link_libraries(KF5IconThemes PRIVATE Qt${QT_MAJOR_VERSION}::DBus) endif() set_target_properties(KF5IconThemes PROPERTIES VERSION ${KICONTHEMES_VERSION} @@ -90,7 +90,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kiconthemes_export.h ${KIconThemes_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KIconThemes COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KIconThemes COMPONENT Devel ) if(BUILD_DESIGNERPLUGIN) @@ -127,14 +127,14 @@ endif() include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KIconThemes LIB_NAME KF5IconThemes DEPS "widgets" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KIconThemes) +ecm_generate_pri_file(BASE_NAME KIconThemes LIB_NAME KF5IconThemes DEPS "widgets" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KIconThemes) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) add_library(KIconEnginePlugin MODULE kiconengineplugin.cpp) target_link_libraries(KIconEnginePlugin PRIVATE - Qt5::Gui + Qt${QT_MAJOR_VERSION}::Gui KF5::IconThemes ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/src/kiconcolors.cpp new/kiconthemes-5.90.0/src/kiconcolors.cpp --- old/kiconthemes-5.89.0/src/kiconcolors.cpp 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/src/kiconcolors.cpp 2022-01-01 13:31:29.000000000 +0100 @@ -19,7 +19,11 @@ .ColorScheme-HighlightedText{ color:%4; }\ .ColorScheme-PositiveText{ color:%5; }\ .ColorScheme-NeutralText{ color:%6; }\ -.ColorScheme-NegativeText{ color:%7; }"); +.ColorScheme-NegativeText{ color:%7; }\ +.ColorScheme-ActiveText{ color:%8; }\ +.ColorScheme-Complement{ color:%9; }\ +.ColorScheme-Contrast{ color:%10; }\ +"); /* clang-format on */ } @@ -51,6 +55,7 @@ QColor positiveText; QColor neutralText; QColor negativeText; + QColor activeText; }; KIconColors::KIconColors() @@ -97,22 +102,38 @@ d->positiveText = scheme.foreground(KColorScheme::PositiveText).color().name(); d->neutralText = scheme.foreground(KColorScheme::NeutralText).color().name(); d->negativeText = scheme.foreground(KColorScheme::NegativeText).color().name(); + d->activeText = scheme.foreground(KColorScheme::ActiveText).color().name(); } KIconColors::~KIconColors() { } +qreal luma(const QColor &color) { + return (0.299 * color.red() + 0.587 * color.green() + 0.114 * color.blue()) / 255; +} + QString KIconColors::stylesheet(KIconLoader::States state) const { Q_D(const KIconColors); - return STYLESHEET_TEMPLATE().arg(state == KIconLoader::SelectedState ? d->highlightedText.name() : d->text.name(), - state == KIconLoader::SelectedState ? d->highlight.name() : d->background.name(), - state == KIconLoader::SelectedState ? d->highlightedText.name() : d->highlight.name(), - state == KIconLoader::SelectedState ? d->highlight.name() : d->highlightedText.name(), - state == KIconLoader::SelectedState ? d->highlightedText.name() : d->positiveText.name(), - state == KIconLoader::SelectedState ? d->highlightedText.name() : d->neutralText.name(), - state == KIconLoader::SelectedState ? d->highlightedText.name() : d->negativeText.name()); + + const QColor complement = + luma(d->background) > 0.5 ? Qt::white : Qt::black; + + const QColor contrast = + luma(d->background) > 0.5 ? Qt::black : Qt::white; + + return STYLESHEET_TEMPLATE() + .arg(state == KIconLoader::SelectedState ? d->highlightedText.name() : d->text.name()) + .arg(state == KIconLoader::SelectedState ? d->highlight.name() : d->background.name()) + .arg(state == KIconLoader::SelectedState ? d->highlightedText.name() : d->highlight.name()) + .arg(state == KIconLoader::SelectedState ? d->highlight.name() : d->highlightedText.name()) + .arg(state == KIconLoader::SelectedState ? d->highlightedText.name() : d->positiveText.name()) + .arg(state == KIconLoader::SelectedState ? d->highlightedText.name() : d->neutralText.name()) + .arg(state == KIconLoader::SelectedState ? d->highlightedText.name() : d->negativeText.name()) + .arg(state == KIconLoader::SelectedState ? d->highlightedText.name() : d->activeText.name()) + .arg(complement.name()) + .arg(contrast.name()); } QColor KIconColors::highlight() const @@ -157,6 +178,12 @@ return d->neutralText; } +QColor KIconColors::activeText() const +{ + Q_D(const KIconColors); + return d->activeText; +} + void KIconColors::setText(const QColor &color) { Q_D(KIconColors); @@ -198,3 +225,9 @@ Q_D(KIconColors); d->positiveText = color; } + +void KIconColors::setActiveText(const QColor &color) +{ + Q_D(KIconColors); + d->activeText = color; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/src/kiconcolors.h new/kiconthemes-5.90.0/src/kiconcolors.h --- old/kiconthemes-5.89.0/src/kiconcolors.h 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/src/kiconcolors.h 2022-01-01 13:31:29.000000000 +0100 @@ -58,6 +58,7 @@ QColor neutralText() const; QColor positiveText() const; QColor negativeText() const; + QColor activeText() const; void setText(const QColor &color); void setHighlight(const QColor &color); @@ -66,6 +67,7 @@ void setNeutralText(const QColor &color); void setPositiveText(const QColor &color); void setNegativeText(const QColor &color); + void setActiveText(const QColor& color); protected: /** @@ -74,7 +76,8 @@ * * Specifies: .ColorScheme-Text, .ColorScheme-Background, .ColorScheme-Highlight, * .ColorScheme-HighlightedText, .ColorScheme-PositiveText, .ColorScheme-NeutralText - * and .ColorScheme-NegativeText + * .ColorScheme-NegativeText, .ColorScheme-ActiveText, .ColorScheme-Complement, + * .ColorScheme-Contrast */ QString stylesheet(KIconLoader::States state) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/src/kicondialogmodel_p.h new/kiconthemes-5.90.0/src/kicondialogmodel_p.h --- old/kiconthemes-5.89.0/src/kicondialogmodel_p.h 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/src/kicondialogmodel_p.h 2022-01-01 13:31:29.000000000 +0100 @@ -11,10 +11,9 @@ #include <QPixmap> #include <QSize> #include <QString> +#include <QStringList> #include <QVector> -class QStringList; - struct KIconDialogModelData { QString name; QString path; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/src/kiconengine.cpp new/kiconthemes-5.90.0/src/kiconengine.cpp --- old/kiconthemes-5.89.0/src/kiconengine.cpp 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/src/kiconengine.cpp 2022-01-01 13:31:29.000000000 +0100 @@ -136,7 +136,11 @@ return createPixmap(size, 1 /*scale*/, mode, state); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +QString KIconEngine::iconName() +#else QString KIconEngine::iconName() const +#endif { if (!d->mIconLoader || !d->mIconLoader->hasIcon(mIconName)) { return QString(); @@ -149,7 +153,11 @@ (QList<QSize>() << QSize(16, 16) << QSize(22, 22) << QSize(32, 32) << QSize(48, 48) << QSize(64, 64) << QSize(128, 128) << QSize(256, 256))) +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +QList<QSize> KIconEngine::availableSizes(QIcon::Mode mode, QIcon::State state) +#else QList<QSize> KIconEngine::availableSizes(QIcon::Mode mode, QIcon::State state) const +#endif { Q_UNUSED(mode); Q_UNUSED(state); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/src/kiconengine.h new/kiconthemes-5.90.0/src/kiconengine.h --- old/kiconthemes-5.89.0/src/kiconengine.h 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/src/kiconengine.h 2022-01-01 13:31:29.000000000 +0100 @@ -70,10 +70,18 @@ void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) override; /// Reimplementation QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) override; + +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + /// Reimplementation + QString iconName() override; + /// Reimplementation + QList<QSize> availableSizes(QIcon::Mode mode, QIcon::State state) override; +#else /// Reimplementation QString iconName() const override; /// Reimplementation QList<QSize> availableSizes(QIcon::Mode mode, QIcon::State state) const override; +#endif QString key() const override; QIconEngine *clone() const override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/src/kiconloader.cpp new/kiconthemes-5.90.0/src/kiconloader.cpp --- old/kiconthemes-5.89.0/src/kiconloader.cpp 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/src/kiconloader.cpp 2022-01-01 13:31:29.000000000 +0100 @@ -415,7 +415,13 @@ QFile file(fileName); if (file.open(QIODevice::ReadOnly)) { QTextStream stream(&file); + // In Qt6 the encoding is UTF-8 by default, so it should work for icon file names; + // I think this code had "ISO 8859-1" (i.e. Latin-1) as an optimization, but file + // names on Linux are UTF-8 by default, so this would be more robust. + // Note that in Qt6 we can have the same behaviour by using QTextStream::setEncoding(). +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) stream.setCodec("ISO 8859-1"); +#endif while (!stream.atEnd()) { const QString line = stream.readLine(); if (line.isEmpty() || line[0] == QLatin1Char('#')) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/src/tools/kiconfinder/CMakeLists.txt new/kiconthemes-5.90.0/src/tools/kiconfinder/CMakeLists.txt --- old/kiconthemes-5.89.0/src/tools/kiconfinder/CMakeLists.txt 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/src/tools/kiconfinder/CMakeLists.txt 2022-01-01 13:31:29.000000000 +0100 @@ -1,5 +1,5 @@ add_executable(kiconfinder5 kiconfinder.cpp) ecm_mark_nongui_executable(kiconfinder5) -target_link_libraries(kiconfinder5 Qt5::Gui KF5IconThemes) +target_link_libraries(kiconfinder5 Qt${QT_MAJOR_VERSION}::Gui KF5IconThemes) install(TARGETS kiconfinder5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/src/tools/ksvg2icns/CMakeLists.txt new/kiconthemes-5.90.0/src/tools/ksvg2icns/CMakeLists.txt --- old/kiconthemes-5.89.0/src/tools/ksvg2icns/CMakeLists.txt 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/src/tools/ksvg2icns/CMakeLists.txt 2022-01-01 13:31:29.000000000 +0100 @@ -1,5 +1,5 @@ add_executable(ksvg2icns ksvg2icns.cpp) ecm_mark_nongui_executable(ksvg2icns) -target_link_libraries(ksvg2icns Qt5::Gui Qt5::Svg) +target_link_libraries(ksvg2icns Qt${QT_MAJOR_VERSION}::Gui Qt${QT_MAJOR_VERSION}::Svg) install(TARGETS ksvg2icns ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.89.0/tests/CMakeLists.txt new/kiconthemes-5.90.0/tests/CMakeLists.txt --- old/kiconthemes-5.89.0/tests/CMakeLists.txt 2021-12-04 19:37:40.000000000 +0100 +++ new/kiconthemes-5.90.0/tests/CMakeLists.txt 2022-01-01 13:31:29.000000000 +0100 @@ -1,12 +1,12 @@ include(ECMMarkAsTest) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) macro(kiconthemes_executable_tests) foreach(_testname ${ARGN}) add_executable(${_testname} ${_testname}.cpp) - target_link_libraries(${_testname} Qt5::Test KF5::IconThemes KF5::WidgetsAddons) + target_link_libraries(${_testname} Qt${QT_MAJOR_VERSION}::Test KF5::IconThemes KF5::WidgetsAddons) ecm_mark_as_test(${_testname}) endforeach(_testname) endmacro()
