onkelbeh
/
GentooRepository
mirror of https://github.com/gentoo-mirror/gentoo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x11-libs/gtkdatabox: fix undefined references 

Closes: https://bugs.gentoo.org/913728
Upstream-PR: https://sourceforge.net/p/gtkdatabox/git/merge-requests/5/
Upstream-Commit: 88d2bd6657/
Signed-off-by: orbea <orbea@riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/35782
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
This commit is contained in:
orbea 2024-03-16 09:06:43 -07:00 committed by Andrew Ammerlaan
parent a066c6b25b
commit 6ea3c80167
No known key found for this signature in database
GPG Key ID: A2E2304370447E8E
2 changed files with 57 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
x11-libs/gtkdatabox/files/gtkdatabox-1.0.0-slibtool.patch Normal file
View File

@ -0,0 +1,48 @@
https://sourceforge.net/p/gtkdatabox/git/merge-requests/5/
https://sourceforge.net/p/gtkdatabox/git/ci/88d2bd66571e083e3beaf0ea6004c1b739a20713/
From 88d2bd66571e083e3beaf0ea6004c1b739a20713 Mon Sep 17 00:00:00 2001
From: orbea <orbea@riseup.net>
Date: Thu, 7 Mar 2024 14:29:18 -0800
Subject: [PATCH] gtk: add missing libm depedency
When building with slibtool it fails with undefined references for libm,
with GNU libtool it doesn't fails because -no-undefined gets silently
ignored while slibtool correctly passes -Wl,--no-undefined to the
linker.
Gentoo issue: https://bugs.gentoo.org/913728
---
configure.ac | 2 ++
gtk/Makefile.am | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 78b8caa..ac95247 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,8 @@ AC_PROG_CC_C99
AC_PROG_CPP
AC_PROG_INSTALL
+LT_LIB_M
+
m4_define([gtk_required_version], [3.4.0])
m4_define([pango_required_version], [1.29.0])
m4_define([cairo_required_version], [1.10.0])
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 4a816fb..7d399de 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -20,7 +20,10 @@ libgtkdatabox_la_SOURCES= \
libgtkdatabox_la_LDFLAGS= \
-version-info $(DATABOX_LT_VERSION)\
- -no-undefined \
+ -no-undefined
+
+libgtkdatabox_la_LIBADD= \
+ @LIBM@ \
@GTK_LIBS@

15
x11-libs/gtkdatabox/gtkdatabox-1.0.0-r1.ebuild
View File

@ -1,9 +1,9 @@
# Copyright 1999-2022 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit xdg-utils
inherit autotools xdg-utils
DESCRIPTION="Gtk+ Widgets for live display of large amounts of fluctuating numerical data"
HOMEPAGE="https://sourceforge.net/projects/gtkdatabox/"
@ -26,16 +26,19 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-slibtool.patch
)
src_prepare() {
default
# Remove -D.*DISABLE_DEPRECATED cflags
find . -iname 'Makefile.am' -exec \
sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die
# Do Makefile.in after Makefile.am to avoid automake maintainer-mode
find . -iname 'Makefile.in' -exec \
sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die
sed -e '/SUBDIRS/{s: examples::;}' -i Makefile.am -i Makefile.in || die
sed -e '/SUBDIRS/{s: examples::;}' -i Makefile.am || die
eautoreconf
}
src_configure() {