commit: 796e310f9f942086471dcc5b4ab00008e27911f4 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Feb 3 05:04:28 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Feb 3 05:10:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=796e310f
x11-plugins/gkrellweather: scrub patches Bug: https://bugs.gentoo.org/892251 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/gkrellweather-2.0.8-Move-GrabWeather.patch | 9 --------- .../files/gkrellweather-2.0.8-update-locations.patch | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Move-GrabWeather.patch b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Move-GrabWeather.patch index 5e2eb95e33fc..10d7cfc994bc 100644 --- a/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Move-GrabWeather.patch +++ b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Move-GrabWeather.patch @@ -4,13 +4,6 @@ Date: Tue, 24 Aug 2010 12:23:25 -0400 Subject: [PATCH] Move GrabWeather script to $(PREFIX)/libexec/gkrellweather/ This is to avoid a file collision with x11-misc/bbweather (Bug #333289) ---- - Makefile | 4 ++-- - gkrellweather.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index d6dc404..693b4f2 100644 --- a/Makefile +++ b/Makefile @@ -38,13 +38,13 @@ install: @@ -29,8 +22,6 @@ index d6dc404..693b4f2 100644 dist: rm -rf $(PKGNAME)-$(VERSION) -diff --git a/gkrellweather.c b/gkrellweather.c -index 1d4cf4e..224260a 100644 --- a/gkrellweather.c +++ b/gkrellweather.c @@ -721,7 +721,7 @@ apply_air_config (void) diff --git a/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-update-locations.patch b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-update-locations.patch index 0faf2627170f..b7190c04f9fe 100644 --- a/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-update-locations.patch +++ b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-update-locations.patch @@ -1,5 +1,5 @@ ---- gkrellweather-2.0.8/GrabWeather 2009-01-11 13:15:02.000000000 -0500 -+++ gkrellweather-2.0.8-r1/GrabWeather 2016-08-29 00:02:35.345041005 -0400 +--- a/GrabWeather ++++ b/GrabWeather @@ -12,7 +12,8 @@ $ReportDir = '.wmWeatherReports';