commit: 3ff01798737e0c35c4acf5bff0b3befc4e9032ee Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Feb 3 04:59:38 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Feb 3 05:08:02 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ff01798
x11-plugins/gkrellm-mailwatch: scrub patches Bug: https://bugs.gentoo.org/892251 Signed-off-by: Sam James <sam <AT> gentoo.org> .../gkrellm-mailwatch/files/2.4.3-0001-Respect-LDFLAGS.patch | 6 ------ .../files/2.4.3-0002-Use-gkrellm_gkd_string_width.patch | 6 ------ .../files/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch | 6 ------ .../files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch | 6 ------ 4 files changed, 24 deletions(-) diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0001-Respect-LDFLAGS.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0001-Respect-LDFLAGS.patch index 158357dc4855..cbffef6c2def 100644 --- a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0001-Respect-LDFLAGS.patch +++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0001-Respect-LDFLAGS.patch @@ -5,12 +5,6 @@ Subject: [PATCH 1/3] Respect LDFLAGS Instead of using a non-standard varible name like LFLAGS, using LDFLAGS lets this play nice with Gentoo's build system. ---- - Makefile | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index b8cf927..02ca376 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ INSTALL=install -c -m 755 diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0002-Use-gkrellm_gkd_string_width.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0002-Use-gkrellm_gkd_string_width.patch index 7edff1c74990..0b5f345f0bdb 100644 --- a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0002-Use-gkrellm_gkd_string_width.patch +++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0002-Use-gkrellm_gkd_string_width.patch @@ -7,12 +7,6 @@ This wrapper is designed to transition from GdkFont to PangoFontDescription. Without it, there is a warning and a probable runtime crash, as we are feeding the wrong structure into 'gdk_string_width'. ---- - mailwatch.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/mailwatch.c b/mailwatch.c -index 3f0f0a2..5cca01e 100644 --- a/mailwatch.c +++ b/mailwatch.c @@ -608,7 +608,7 @@ update_plugin(void) { diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch index 5cc76c6fc828..6e91c94e7a01 100644 --- a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch +++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch @@ -4,12 +4,6 @@ Date: Mon, 1 Nov 2010 08:44:17 -0400 Subject: [PATCH 3/3] Remove a few more GCC warnings These are mostly harmless, but no harm in cleaning them up. ---- - mailwatch.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/mailwatch.c b/mailwatch.c -index 5cca01e..fcb77a8 100644 --- a/mailwatch.c +++ b/mailwatch.c @@ -198,7 +198,7 @@ check_mh(Mailbox * mbox) { diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch index 828c9dd2d5f4..f95fbe4dfbb0 100644 --- a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch +++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch @@ -5,12 +5,6 @@ Subject: [PATCH 4/4] Do not force -O2 in CFLAGS Only uses -O2 if the user has not specified any CFLAGS in the environment. ---- - Makefile | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/Makefile b/Makefile -index 02ca376..c4ca35c 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,8 @@ GKRELLM_INCLUDE= -I/usr/local/include
