public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellstock/files/, x11-plugins/gkrellstock/
@ 2022-04-21 19:55 Sam James
  0 siblings, 0 replies; only message in thread
From: Sam James @ 2022-04-21 19:55 UTC (permalink / raw
  To: gentoo-commits

commit:     a29e62831a024a5ec550fc8a74d6fa48441722bc
Author:     Thomas Bracht Laumann Jespersen <t <AT> laumann <DOT> xyz>
AuthorDate: Thu Apr  7 13:11:24 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 19:54:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a29e6283

x11-plugins/gkrellstock: update EAPI 6 -> 8

Signed-off-by: Thomas Bracht Laumann Jespersen <t <AT> laumann.xyz>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../gkrellstock-0.5.1-r2-makefile-fixes.patch      | 26 +++++++++++++
 .../gkrellstock/gkrellstock-0.5.1-r2.ebuild        | 44 ++++++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/x11-plugins/gkrellstock/files/gkrellstock-0.5.1-r2-makefile-fixes.patch b/x11-plugins/gkrellstock/files/gkrellstock-0.5.1-r2-makefile-fixes.patch
new file mode 100644
index 000000000000..1b827a749272
--- /dev/null
+++ b/x11-plugins/gkrellstock/files/gkrellstock-0.5.1-r2-makefile-fixes.patch
@@ -0,0 +1,26 @@
+Respect the user's pkg-config, remove "-O2 -Wall" flags, don't call gcc directly
+--- a/Makefile
++++ b/Makefile
+@@ -1,16 +1,17 @@
+-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 = -O2 -Wall -fPIC $(GTK_INCLUDE)
++FLAGS = -fPIC $(GTK_INCLUDE)
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+ 
+-CC = gcc $(CFLAGS) $(FLAGS)
++CC = $(CC)
+ 
+ OBJS = gkrellstock.o
+ 
+ gkrellstock.so: $(OBJS)
+-	$(CC) $(LDFLAGS) $(OBJS) -o gkrellstock.so $(LFLAGS) $(LIBS) 
++	$(CC) $(CFLAGS) $(FLAGS) $(LDFLAGS) $(OBJS) -o gkrellstock.so $(LFLAGS) $(LIBS)
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~

diff --git a/x11-plugins/gkrellstock/gkrellstock-0.5.1-r2.ebuild b/x11-plugins/gkrellstock/gkrellstock-0.5.1-r2.ebuild
new file mode 100644
index 000000000000..6fcbaee5ee28
--- /dev/null
+++ b/x11-plugins/gkrellstock/gkrellstock-0.5.1-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="Get Stock quotes plugin for Gkrellm2"
+HOMEPAGE="http://gkrellstock.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gkrellstock/${P}.tar.gz"
+S="${WORKDIR}/${P/s/S}"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	dev-perl/libwww-perl
+	dev-perl/Finance-Quote"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5-ldflags.patch
+	"${FILESDIR}"/${PN}-0.5.1-r2-makefile-fixes.patch
+)
+
+src_configure() {
+	tc-export PKG_CONFIG
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags gtk+-2.0)
+	append-flags -fPIC
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	gkrellm-plugin_src_install
+	dobin GetQuote2
+}


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2022-04-21 19:55 UTC | newest]

Thread overview: (only message) (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/gkrellstock/files/, x11-plugins/gkrellstock/ Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox