From 709399e43bdc27307f6e43a80f3909f704951d85 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Fri, 28 Jan 2022 17:09:58 +0100 Subject: [PATCH v3 04/10] gnu: breeze-icons: Update to 5.90.0. * gnu/packages/kde-frameworks.scm (breeze-icons): Update to 5.90.0. * gnu/local.mk: Add patch. * gnu/packages/patches/breeze-icons-fix-dupe-tests.patch: New file. diff --git a/gnu/local.mk b/gnu/local.mk index 27e7877361..b850ed7b61 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -888,6 +888,7 @@ dist_patch_DATA = \ %D%/packages/patches/bc-fix-cross-compilation.patch \ %D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch \ %D%/packages/patches/bind-re-add-attr-constructor-priority.patch \ + %D%/packages/patches/breeze-icons-fix-dupe-tests.patch \ %D%/packages/patches/brightnessctl-elogind-support.patch \ %D%/packages/patches/bsd-games-2.17-64bit.patch \ %D%/packages/patches/bsd-games-add-configure-config.patch \ diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index f6259d0749..dacdcdf0d3 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -311,19 +311,24 @@ (define-public bluez-qt (define-public breeze-icons (package (name "breeze-icons") - (version "5.70.0") + (version "5.90.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" (version-major+minor version) "/" name "-" version ".tar.xz")) + (patches + ;; TODO: Remove with next update (5.91.0) + (search-patches "breeze-icons-fix-dupe-tests.patch")) (sha256 (base32 - "0lqglrjgjb4ralgmr7lb9k7acmn8q4jm18s4p3gbgd9iswyqgsbm")))) + "06dfh571rf8gp4gnnqn13xqgc1bpc4ycn6bmxf38x53fxxfl3fnn")))) (build-system cmake-build-system) + (arguments + `(#:tests? #f)) ; failing tests https://invent.kde.org/frameworks/breeze-icons/-/issues/7 (native-inputs - (list extra-cmake-modules fdupes libxml2)) + (list extra-cmake-modules fdupes python-lxml python)) (inputs (list qtbase-5)) (home-page "https://community.kde.org/Frameworks") diff --git a/gnu/packages/patches/breeze-icons-fix-dupe-tests.patch b/gnu/packages/patches/breeze-icons-fix-dupe-tests.patch new file mode 100644 index 0000000000..03f488e90e --- /dev/null +++ b/gnu/packages/patches/breeze-icons-fix-dupe-tests.patch @@ -0,0 +1,166 @@ +diff --git a/icons/places/16/folder-book.svg b/icons/places/16/folder-book.svg +deleted file mode 100644 +index eff7ce8601b2bfdf52b9adaa1beec9e347801984..0000000000000000000000000000000000000000 +--- a/icons/places/16/folder-book.svg ++++ /dev/null +@@ -1,13 +0,0 @@ +- +- +- +- +- +- +diff --git a/icons/places/16/folder-book.svg b/icons/places/16/folder-book.svg +new file mode 120000 +index 0000000000000000000000000000000000000000..328a27f31fe7f2a46c0ded43b67051ebc4638e52 +--- /dev/null ++++ b/icons/places/16/folder-book.svg +@@ -0,0 +1 @@ ++../../actions/16/address-book-new.svg +\ No newline at end of file +diff --git a/icons/places/16/folder-comic.svg b/icons/places/16/folder-comic.svg +deleted file mode 100644 +index e2f5c9f363d633d23f3b0a63af377d82fbb1103c..0000000000000000000000000000000000000000 +--- a/icons/places/16/folder-comic.svg ++++ /dev/null +@@ -1,13 +0,0 @@ +- +- +- +- +- +- +diff --git a/icons/places/16/folder-comic.svg b/icons/places/16/folder-comic.svg +new file mode 120000 +index 0000000000000000000000000000000000000000..0725f95054153138ba1278d2b41df2ea3b235b48 +--- /dev/null ++++ b/icons/places/16/folder-comic.svg +@@ -0,0 +1 @@ ++../../actions/16/kmouth-phrasebook.svg +\ No newline at end of file +diff --git a/icons/places/16/folder-library.svg b/icons/places/16/folder-library.svg +deleted file mode 100644 +index d78dee94562c85c1e9c115f3d7965ab7092dfc55..0000000000000000000000000000000000000000 +--- a/icons/places/16/folder-library.svg ++++ /dev/null +@@ -1,14 +0,0 @@ +- +- +- +- +- +- +diff --git a/icons/places/16/folder-library.svg b/icons/places/16/folder-library.svg +new file mode 120000 +index 0000000000000000000000000000000000000000..1ce765dfa2fda283888529fdc5cf966f8dbbdd6f +--- /dev/null ++++ b/icons/places/16/folder-library.svg +@@ -0,0 +1 @@ ++../../actions/16/view-institution.svg +\ No newline at end of file +diff --git a/icons/places/22/folder-book.svg b/icons/places/22/folder-book.svg +deleted file mode 100644 +index d124463e00598055518c8e43a6b505d2fcd16b91..0000000000000000000000000000000000000000 +--- a/icons/places/22/folder-book.svg ++++ /dev/null +@@ -1,14 +0,0 @@ +- +- +- +- +- +- +diff --git a/icons/places/22/folder-book.svg b/icons/places/22/folder-book.svg +new file mode 120000 +index 0000000000000000000000000000000000000000..69db4d5775e03202922f8d620ad6bd755a8f7c89 +--- /dev/null ++++ b/icons/places/22/folder-book.svg +@@ -0,0 +1 @@ ++../../actions/22/address-book-new.svg +\ No newline at end of file +diff --git a/icons/places/22/folder-comic.svg b/icons/places/22/folder-comic.svg +deleted file mode 100644 +index 75c26bc4abf2650b8f7871e39be8e08a0838e76b..0000000000000000000000000000000000000000 +--- a/icons/places/22/folder-comic.svg ++++ /dev/null +@@ -1,14 +0,0 @@ +- +- +- +- +- +- +diff --git a/icons/places/22/folder-comic.svg b/icons/places/22/folder-comic.svg +new file mode 120000 +index 0000000000000000000000000000000000000000..097a5a84794498b7e35459c5ae5833ae29e39ccf +--- /dev/null ++++ b/icons/places/22/folder-comic.svg +@@ -0,0 +1 @@ ++../../actions/22/kmouth-phrasebook.svg +\ No newline at end of file +diff --git a/icons/places/22/folder-library.svg b/icons/places/22/folder-library.svg +deleted file mode 100644 +index d62c7ddf8340e89671fe140afbb6cf65ea4aa54a..0000000000000000000000000000000000000000 +--- a/icons/places/22/folder-library.svg ++++ /dev/null +@@ -1,14 +0,0 @@ +- +- +- +- +- +- +diff --git a/icons/places/22/folder-library.svg b/icons/places/22/folder-library.svg +new file mode 120000 +index 0000000000000000000000000000000000000000..d95f23aa116a635296a9d61b9c6d3b933f7478e9 +--- /dev/null ++++ b/icons/places/22/folder-library.svg +@@ -0,0 +1 @@ ++../../actions/22/view-institution.svg +\ No newline at end of file -- 2.34.0