[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellshoot/files/

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellshoot/files/

[Sam James]

commit:     726c9b0eb242a23ec1b51b379b1f3d4369fdc46c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  3 05:03:11 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  3 05:10:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=726c9b0e

x11-plugins/gkrellshoot: scrub patches

Bug: https://bugs.gentoo.org/892251
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r4-pkgconfig.patch  | 6 ------
 .../gkrellshoot/files/gkrellshoot-0.4.4-r5-fix-implicit-int.patch   | 6 ------
 x11-plugins/gkrellshoot/files/makefile-respect-flags.patch          | 4 ++--
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r4-pkgconfig.patch b/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r4-pkgconfig.patch
index d6dfb54e4354..1f3186f652f4 100644
--- a/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r4-pkgconfig.patch
+++ b/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r4-pkgconfig.patch
@@ -3,12 +3,6 @@ From: Thomas Bracht Laumann Jespersen <t@laumann.xyz>
 Date: Sat, 26 Mar 2022 10:32:18 +0100
 Subject: [PATCH] pkgconfig
 
----
- Makefile | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index e5a4895..296f807 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,5 +1,6 @@

diff --git a/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r5-fix-implicit-int.patch b/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r5-fix-implicit-int.patch
index fae0a519ba05..f9ee064b0a73 100644
--- a/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r5-fix-implicit-int.patch
+++ b/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r5-fix-implicit-int.patch
@@ -3,12 +3,6 @@ By default clang16 will not allow implicit integer declarations in function para
 Bug: https://bugs.gentoo.org/874891
 
 Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
----
- gkrellshoot.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gkrellshoot.c b/gkrellshoot.c
-index 114a85e..0d74d1d 100755
 --- a/gkrellshoot.c
 +++ b/gkrellshoot.c
 @@ -436,7 +436,7 @@ double star_screenx[NUM_STARS];

diff --git a/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch b/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch
index 8de89009dbbc..9b3dd81c3d1b 100644
--- a/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch
+++ b/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch
@@ -1,5 +1,5 @@
---- a/Makefile	2006-12-09 04:24:36.000000000 +0100
-+++ b/Makefile	2013-03-16 13:50:00.147834790 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -1,16 +1,20 @@
  GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
  GTK_LIB = `pkg-config gtk+-2.0 --libs`