* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellshoot/, x11-plugins/gkrellshoot/files/
@ 2022-01-01 15:48 Florian Schmaus
0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2022-01-01 15:48 UTC (permalink / raw
To: gentoo-commits
commit: fdd5a72b90396ae4a152df30a9f67437def59a74
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 1 15:47:55 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Jan 1 15:48:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdd5a72b
x11-plugins/gkrellshoot: respect LDFLAGS
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
Closes: https://bugs.gentoo.org/338867
.../gkrellshoot/files/makefile-respect-flags.patch | 26 ++++++++++++++++++++++
...0.4.4-r2.ebuild => gkrellshoot-0.4.4-r3.ebuild} | 6 ++++-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch b/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch
new file mode 100644
index 000000000000..8de89009dbbc
--- /dev/null
+++ b/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch
@@ -0,0 +1,26 @@
+--- a/Makefile 2006-12-09 04:24:36.000000000 +0100
++++ b/Makefile 2013-03-16 13:50:00.147834790 +0100
+@@ -1,16 +1,20 @@
+ GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
+ GTK_LIB = `pkg-config gtk+-2.0 --libs`
+
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
++FLAGS = -fPIC $(GTK_INCLUDE)
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+
+-CC = gcc $(CFLAGS) $(FLAGS)
+
+ OBJS = gkrellshoot.o
+
++all: gkrellshoot.so
++
++%.o: %.c
++ $(CC) $(CFLAGS) $(LDFLAGS) $(FLAGS) -c -o $@ $<
++
+ gkrellshoot.so: $(OBJS)
+- $(CC) $(OBJS) -o gkrellshoot.so $(LFLAGS) $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(FLAGS) $(OBJS) -o gkrellshoot.so $(LFLAGS) $(LIBS)
+
+ clean:
+ rm -f *.o core *.so* *.bak *~
diff --git a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r2.ebuild b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r3.ebuild
similarity index 82%
rename from x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r2.ebuild
rename to x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r3.ebuild
index ad424be2249b..028ef92f7eb6 100644
--- a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r2.ebuild
+++ b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -20,3 +20,7 @@ RDEPEND="
virtual/imagemagick-tools"
S=${WORKDIR}/${P/s/S}
+
+PATCHES=(
+ "${FILESDIR}"/makefile-respect-flags.patch
+)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellshoot/, x11-plugins/gkrellshoot/files/
@ 2022-04-21 19:55 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-04-21 19:55 UTC (permalink / raw
To: gentoo-commits
commit: c4a5fe089e964db669c527c85ef106884bca4be7
Author: Thomas Bracht Laumann Jespersen <t <AT> laumann <DOT> xyz>
AuthorDate: Thu Mar 24 20:22:33 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 19:54:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4a5fe08
x11-plugins/gkrellshoot: update EAPI 6 -> 8
Signed-off-by: Thomas Bracht Laumann Jespersen <t <AT> laumann.xyz>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/gkrellshoot-0.4.4-r4-pkgconfig.patch | 25 +++++++++++++++++
.../gkrellshoot/gkrellshoot-0.4.4-r4.ebuild | 31 ++++++++++++++++++++++
2 files changed, 56 insertions(+)
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
new file mode 100644
index 000000000000..d6dfb54e4354
--- /dev/null
+++ b/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r4-pkgconfig.patch
@@ -0,0 +1,25 @@
+From 47a80a178b4ab0225ff0540376be5b5c740530a7 Mon Sep 17 00:00:00 2001
+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 @@
+-GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
+-GTK_LIB = `pkg-config gtk+-2.0 --libs`
++PKG_CONFIG ?= pkg-config
++GTK_INCLUDE = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK_LIB = $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
+
+ FLAGS = -fPIC $(GTK_INCLUDE)
+ LIBS = $(GTK_LIB)
+--
+2.34.1
+
diff --git a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild
new file mode 100644
index 000000000000..d5bff5dbad4b
--- /dev/null
+++ b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="GKrellm2 plugin to take screen shots and lock screen"
+HOMEPAGE="http://gkrellshoot.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gkrellshoot/${P}.tar.gz"
+S="${WORKDIR}/${P/s/S}"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="app-admin/gkrellm:2[X]"
+RDEPEND="
+ ${DEPEND}
+ virtual/imagemagick-tools"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/makefile-respect-flags.patch
+ "${FILESDIR}/${P}"-r4-pkgconfig.patch
+)
+
+src_compile() {
+ tc-export PKG_CONFIG
+ default
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellshoot/, x11-plugins/gkrellshoot/files/
@ 2022-12-04 23:58 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-12-04 23:58 UTC (permalink / raw
To: gentoo-commits
commit: 19bc91aca1909164fe68851006b5b1631a6693cd
Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Wed Nov 30 20:18:03 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 4 23:56:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19bc91ac
x11-plugins/gkrellshoot: fix build for clang16
Closes: https://bugs.gentoo.org/874891
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/28486
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../gkrellshoot-0.4.4-r5-fix-implicit-int.patch | 25 +++++++++++++++++
.../gkrellshoot/gkrellshoot-0.4.4-r5.ebuild | 32 ++++++++++++++++++++++
2 files changed, 57 insertions(+)
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
new file mode 100644
index 000000000000..fae0a519ba05
--- /dev/null
+++ b/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r5-fix-implicit-int.patch
@@ -0,0 +1,25 @@
+By default clang16 will not allow implicit integer declarations in function parameters.
+
+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];
+ double star_screeny[NUM_STARS];
+
+ static void
+-draw_starfield ( chart_index )
++draw_starfield ( size_t chart_index )
+ {
+ gint i;
+ guchar b;
+--
+2.38.1
+
diff --git a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r5.ebuild b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r5.ebuild
new file mode 100644
index 000000000000..d452d63895c9
--- /dev/null
+++ b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="GKrellm2 plugin to take screen shots and lock screen"
+HOMEPAGE="http://gkrellshoot.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gkrellshoot/${P}.tar.gz"
+S="${WORKDIR}/${P/s/S}"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="app-admin/gkrellm:2[X]"
+RDEPEND="
+ ${DEPEND}
+ virtual/imagemagick-tools"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/makefile-respect-flags.patch
+ "${FILESDIR}/${P}"-r4-pkgconfig.patch
+ "${FILESDIR}/${P}"-r5-fix-implicit-int.patch
+)
+
+src_compile() {
+ tc-export PKG_CONFIG
+ default
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-12-04 23:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-21 19:55 [gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellshoot/, x11-plugins/gkrellshoot/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-12-04 23:58 Sam James
2022-01-01 15:48 Florian Schmaus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox