diff options
Diffstat (limited to 'media-libs/libuninameslist')
3 files changed, 97 insertions, 0 deletions
diff --git a/media-libs/libuninameslist/Manifest b/media-libs/libuninameslist/Manifest index 41b1d12d1014..c2b28641b4fb 100644 --- a/media-libs/libuninameslist/Manifest +++ b/media-libs/libuninameslist/Manifest @@ -1,2 +1,3 @@ DIST libuninameslist-20091231.tar.bz2 568820 BLAKE2B 09574729cc8b655bc9921c49b6f81a7c242a761d70865a0ca6b9ef479582f158f05580e81b94100994ede623ebf8e16f482ae2bacbd596d195b2201023a8ee7e SHA512 3780759428ef2bf2fd808de6ea87a44cf85952f926240ea355d692ef08b5e50c1cf068a2ee05b00cf0fc6b725d71142306aae01e9d6e5144291f6e5dc4505bc2 DIST libuninameslist-dist-20200413.tar.gz 1210689 BLAKE2B 10577d930e4f1e2d8dc41d7df684b63897f62dae31d0bb2208b26ec9102ecc2fd0181d7d3d05c6c678de69b4f379805bfcbf0a484fd0076ff65ee2fa1e9d1368 SHA512 88befff4bf7efed149b4e3a5d58a733b2cb6477e103ec34529ff02a88f8c72a6fc9d7b0be9e97cd539a75c8ebe5e4127cdf03a568da2f219157174b9b585b2a3 +DIST libuninameslist-dist-20211114.tar.gz 1247578 BLAKE2B dd96a81c87e214b7b53549ecfcc0b79388a51218f3e6ecb64786d9acc4c540838e2679c4c0f634c94ca55271bb9f3a4350918bd0071c89dbebbd993758ab5314 SHA512 febd0fafe836a85148aa7ceb87888a5882e7c27968c20595026cd947e9e6c1d0246d6e585510377f0e561d36a194d129df302143c67f59dd3b82aa3d30190acb diff --git a/media-libs/libuninameslist/files/libuninameslist-20211114-slibtool.patch b/media-libs/libuninameslist/files/libuninameslist-20211114-slibtool.patch new file mode 100644 index 000000000000..9a3edd736137 --- /dev/null +++ b/media-libs/libuninameslist/files/libuninameslist-20211114-slibtool.patch @@ -0,0 +1,64 @@ +Upstream-PR: https://github.com/fontforge/libuninameslist/pull/27 +From 77f4eea51b87c2e7a36cd3e1e64b424cdd5f7ad8 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Fri, 13 May 2022 21:57:38 -0700 +Subject: [PATCH] build: Link with .la files for internal deps + +When building libuninameslist with --enable-frenchlib and slibtool the +build will fail when it can't find -luninameslist-fr. + +However if libuninameslist is already installed to the system it will +compile successfully using the already installed version of +uninameslist-fr.so instead of the locally built new library. + +This can be fixed by linking with the libtool archive (.la) instead as +should be done for internal dependencies while -l linker flags should be +only for external dependencies. + +Additionally I removed the now redundant DEPENDENCIES and LIBADD line. + +GNU libtool is less strict about user errors and will silently hide such +issues. + +I missed this second issue until now when I fixed the previous issue in +PR https://github.com/fontforge/libuninameslist/pull/24. + +Gentoo Bugs: + https://bugs.gentoo.org/779670 + https://bugs.gentoo.org/792474 +--- + Makefile.am | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index f9fe87c..68c64db 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -44,25 +44,21 @@ lib_LTLIBRARIES += libuninameslist.la + + include_HEADERS = uninameslist.h + libuninameslist_la_LIBADD = +-EXTRA_libuninameslist_la_DEPENDENCIES = + man_MANS = libuninameslist.3 + noinst_HEADERS = nameslist-dll.h +-LIBADD = + + if WANTLIBOFR + include_HEADERS += uninameslist-fr.h + libuninameslist_fr_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(FR_VERSION) + libuninameslist_fr_la_SOURCES = nameslist-fr.c + libuninameslist_fr_la.$(OBJEXT): uninameslist-fr.h nameslist-dll.h buildnameslist.h +-libuninameslist_la_LIBADD += -luninameslist-fr +-EXTRA_libuninameslist_la_DEPENDENCIES += libuninameslist-fr.la ++libuninameslist_la_LIBADD += libuninameslist-fr.la + man_MANS += libuninameslist-fr.3 +-LIBADD += -luninameslist-fr + else + EXTRA_DIST += nameslist-fr.c uninameslist-fr.h libuninameslist-fr.3 + endif + +-libuninameslist_la_LDFLAGS = $(AM_LDFLAGS) $(LIBADD) -version-info $(UN_VERSION) ++libuninameslist_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(UN_VERSION) + libuninameslist_la_SOURCES = nameslist.c + libuninameslist_la.$(OBJEXT): uninameslist.h nameslist-dll.h buildnameslist.h + diff --git a/media-libs/libuninameslist/libuninameslist-20211114.ebuild b/media-libs/libuninameslist/libuninameslist-20211114.ebuild new file mode 100644 index 000000000000..d237b6cedd16 --- /dev/null +++ b/media-libs/libuninameslist/libuninameslist-20211114.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Library of unicode annotation data" +HOMEPAGE="https://github.com/fontforge/libuninameslist" +SRC_URI="https://github.com/fontforge/libuninameslist/releases/download/${PV}/${PN}-dist-${PV}.tar.gz" + +LICENSE="BSD" +SLOT="0/1" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" + +PATCHES=( + "${FILESDIR}/${P}-slibtool.patch" # 792474 +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf --disable-static --enable-frenchlib +} + +src_install() { + default + find "${ED}"/usr -name '*.la' -delete || die +} |