| 1 |
commit: 58a5081de7ff55cd0661013ae65b825a4e04f2e7 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 9 11:15:20 2017 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 9 11:15:20 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=58a5081d |
| 7 |
|
| 8 |
*.eclass: Include GNOME2_ECLASS_ICONS condition in postrm as well |
| 9 |
|
| 10 |
The original GNOME2_ECLASS_ICONS patch has moved the condition from |
| 11 |
gnome2_icon_cache_update to postinst phases of functions using |
| 12 |
the preinst/postinst logic but accidentally omitted postrm. Include it |
| 13 |
there as well to restore the old behavior. |
| 14 |
|
| 15 |
eclass/kde4-base.eclass | 4 +++- |
| 16 |
eclass/kde5.eclass | 4 +++- |
| 17 |
2 files changed, 6 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass |
| 20 |
index ec1082c835..0348a5f80f 100644 |
| 21 |
--- a/eclass/kde4-base.eclass |
| 22 |
+++ b/eclass/kde4-base.eclass |
| 23 |
@@ -1013,7 +1013,9 @@ kde4-base_pkg_postinst() { |
| 24 |
kde4-base_pkg_postrm() { |
| 25 |
debug-print-function ${FUNCNAME} "$@" |
| 26 |
|
| 27 |
- gnome2_icon_cache_update |
| 28 |
+ if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then |
| 29 |
+ gnome2_icon_cache_update |
| 30 |
+ fi |
| 31 |
fdo-mime_desktop_database_update |
| 32 |
fdo-mime_mime_database_update |
| 33 |
buildsycoca |
| 34 |
|
| 35 |
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass |
| 36 |
index 59fe12b9de..9870e73a2f 100644 |
| 37 |
--- a/eclass/kde5.eclass |
| 38 |
+++ b/eclass/kde5.eclass |
| 39 |
@@ -733,7 +733,9 @@ kde5_pkg_postinst() { |
| 40 |
kde5_pkg_postrm() { |
| 41 |
debug-print-function ${FUNCNAME} "$@" |
| 42 |
|
| 43 |
- gnome2_icon_cache_update |
| 44 |
+ if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then |
| 45 |
+ gnome2_icon_cache_update |
| 46 |
+ fi |
| 47 |
xdg_pkg_postrm |
| 48 |
} |
Archives