From 7bf3c5c39a87c951d483bc8e8afc08170975c5d3 Mon Sep 17 00:00:00 2001 From: Muhammad Alfi Syahrin Date: Mon, 23 Dec 2024 09:23:11 +0700 Subject: [PATCH] adwaita-colors-icon-theme: Use patch instead of sed --- .../files/inherit-morewaita.patch | 130 ++++++++++++++++++ .../a/adwaita-colors-icon-theme/package.yml | 13 +- .../pspec_x86_64.xml | 4 +- 3 files changed, 134 insertions(+), 13 deletions(-) create mode 100644 packages/a/adwaita-colors-icon-theme/files/inherit-morewaita.patch diff --git a/packages/a/adwaita-colors-icon-theme/files/inherit-morewaita.patch b/packages/a/adwaita-colors-icon-theme/files/inherit-morewaita.patch new file mode 100644 index 00000000000..681a4120714 --- /dev/null +++ b/packages/a/adwaita-colors-icon-theme/files/inherit-morewaita.patch @@ -0,0 +1,130 @@ +diff --git a/Adwaita-blue/index.theme b/Adwaita-blue/index.theme +index 46550d6..fb811a8 100644 +--- a/Adwaita-blue/index.theme ++++ b/Adwaita-blue/index.theme +@@ -2,7 +2,7 @@ + Name=Adwaita-blue + Comment=The Only One + Example=folder +-Inherits=Adwaita,AdwaitaLegacy,hicolor ++Inherits=MoreWaita,Adwaita,AdwaitaLegacy,hicolor + Hidden=true + + # KDE Specific Stuff +diff --git a/Adwaita-brown/index.theme b/Adwaita-brown/index.theme +index 65e7926..eb0d371 100644 +--- a/Adwaita-brown/index.theme ++++ b/Adwaita-brown/index.theme +@@ -2,7 +2,7 @@ + Name=Adwaita-brown + Comment=The Only One + Example=folder +-Inherits=Adwaita,Adwaita-blue,AdwaitaLegacy,hicolor ++Inherits=MoreWaita,Adwaita,Adwaita-blue,AdwaitaLegacy,hicolor + Hidden=true + + # KDE Specific Stuff +diff --git a/Adwaita-green/index.theme b/Adwaita-green/index.theme +index 01f16b7..4c8e913 100644 +--- a/Adwaita-green/index.theme ++++ b/Adwaita-green/index.theme +@@ -2,7 +2,7 @@ + Name=Adwaita-green + Comment=The Only One + Example=folder +-Inherits=Adwaita,Adwaita-blue,AdwaitaLegacy,hicolor ++Inherits=MoreWaita,Adwaita,Adwaita-blue,AdwaitaLegacy,hicolor + Hidden=true + + # KDE Specific Stuff +diff --git a/Adwaita-orange/index.theme b/Adwaita-orange/index.theme +index 0d247b7..0bf75cf 100644 +--- a/Adwaita-orange/index.theme ++++ b/Adwaita-orange/index.theme +@@ -2,7 +2,7 @@ + Name=Adwaita-orange + Comment=The Only One + Example=folder +-Inherits=Adwaita,Adwaita-blue,AdwaitaLegacy,hicolor ++Inherits=MoreWaita,Adwaita,Adwaita-blue,AdwaitaLegacy,hicolor + Hidden=true + + # KDE Specific Stuff +diff --git a/Adwaita-pink/index.theme b/Adwaita-pink/index.theme +index b905bdc..9f8a392 100644 +--- a/Adwaita-pink/index.theme ++++ b/Adwaita-pink/index.theme +@@ -2,7 +2,7 @@ + Name=Adwaita-pink + Comment=The Only One + Example=folder +-Inherits=Adwaita,Adwaita-blue,AdwaitaLegacy,hicolor ++Inherits=MoreWaita,Adwaita,Adwaita-blue,AdwaitaLegacy,hicolor + Hidden=true + + # KDE Specific Stuff +diff --git a/Adwaita-purple/index.theme b/Adwaita-purple/index.theme +index 6b09a17..427e84a 100644 +--- a/Adwaita-purple/index.theme ++++ b/Adwaita-purple/index.theme +@@ -2,7 +2,7 @@ + Name=Adwaita-purple + Comment=The Only One + Example=folder +-Inherits=Adwaita,Adwaita-blue,AdwaitaLegacy,hicolor ++Inherits=MoreWaita,Adwaita,Adwaita-blue,AdwaitaLegacy,hicolor + Hidden=true + + # KDE Specific Stuff +diff --git a/Adwaita-red/index.theme b/Adwaita-red/index.theme +index 5ca462e..5858ff6 100644 +--- a/Adwaita-red/index.theme ++++ b/Adwaita-red/index.theme +@@ -2,7 +2,7 @@ + Name=Adwaita-red + Comment=The Only One + Example=folder +-Inherits=Adwaita,Adwaita-blue,AdwaitaLegacy,hicolor ++Inherits=MoreWaita,Adwaita,Adwaita-blue,AdwaitaLegacy,hicolor + Hidden=true + + # KDE Specific Stuff +diff --git a/Adwaita-slate/index.theme b/Adwaita-slate/index.theme +index 9c91b4b..b76a496 100644 +--- a/Adwaita-slate/index.theme ++++ b/Adwaita-slate/index.theme +@@ -2,7 +2,7 @@ + Name=Adwaita-slate + Comment=The Only One + Example=folder +-Inherits=Adwaita,Adwaita-blue,AdwaitaLegacy,hicolor ++Inherits=MoreWaita,Adwaita,Adwaita-blue,AdwaitaLegacy,hicolor + Hidden=true + + # KDE Specific Stuff +diff --git a/Adwaita-teal/index.theme b/Adwaita-teal/index.theme +index 01e67c3..5bc94eb 100644 +--- a/Adwaita-teal/index.theme ++++ b/Adwaita-teal/index.theme +@@ -2,7 +2,7 @@ + Name=Adwaita-teal + Comment=The Only One + Example=folder +-Inherits=Adwaita,Adwaita-blue,AdwaitaLegacy,hicolor ++Inherits=MoreWaita,Adwaita,Adwaita-blue,AdwaitaLegacy,hicolor + Hidden=true + + # KDE Specific Stuff +diff --git a/Adwaita-yellow/index.theme b/Adwaita-yellow/index.theme +index cba6024..01fbdab 100644 +--- a/Adwaita-yellow/index.theme ++++ b/Adwaita-yellow/index.theme +@@ -2,7 +2,7 @@ + Name=Adwaita-yellow + Comment=The Only One + Example=folder +-Inherits=Adwaita,Adwaita-blue,AdwaitaLegacy,hicolor ++Inherits=MoreWaita,Adwaita,Adwaita-blue,AdwaitaLegacy,hicolor + Hidden=true + + # KDE Specific Stuff diff --git a/packages/a/adwaita-colors-icon-theme/package.yml b/packages/a/adwaita-colors-icon-theme/package.yml index aea9ba00819..594694919ce 100644 --- a/packages/a/adwaita-colors-icon-theme/package.yml +++ b/packages/a/adwaita-colors-icon-theme/package.yml @@ -1,6 +1,6 @@ name : adwaita-colors-icon-theme version : 2.4.1 -release : 1 +release : 2 source : - https://github.com/dpejoh/Adwaita-colors/archive/refs/tags/v2.4.1.tar.gz : 4c497ce5187f39faf384cb6fe87b122d77e9619cfc1a68ad3544f61a3fc2e6d4 homepage : https://github.com/dpejoh/Adwaita-colors/ @@ -10,15 +10,6 @@ summary : Customizes Adwaita icons to match your GNOME theme's accent color description: | Adwaita Colors customizes Adwaita icons to match your GNOME theme's accent color, providing a cohesive, personalized look. install : | - # Find all directories starting with "Adwaita-" - find $workdir -type d -name "Adwaita-*" | while read -r dir; do - # Construct the full path to the "index.theme" file - file="$dir/index.theme" - # Check if the file exists and contains the target text - if [ -f "$file" ] && grep -q "Inherits=Adwaita," "$file"; then - # Replace the text using sed - sed -i 's/Inherits=Adwaita,/Inherits=MoreWaita,Adwaita,/g' "$file" - fi - done + %patch -p1 -i $pkgfiles/inherit-morewaita.patch install -dm0755 $installdir/usr/share/icons/ cp -r $workdir/Adwaita-* $installdir/usr/share/icons/ diff --git a/packages/a/adwaita-colors-icon-theme/pspec_x86_64.xml b/packages/a/adwaita-colors-icon-theme/pspec_x86_64.xml index 3fbc2894455..406721e90c2 100644 --- a/packages/a/adwaita-colors-icon-theme/pspec_x86_64.xml +++ b/packages/a/adwaita-colors-icon-theme/pspec_x86_64.xml @@ -6968,8 +6968,8 @@ - - 2024-12-19 + + 2024-12-23 2.4.1 Packaging update Muhammad Alfi Syahrin