1 |
commit: c73aabb310313383d209f1d0ec8296fc77db8549 |
2 |
Author: orbea <orbea <AT> riseup <DOT> net> |
3 |
AuthorDate: Mon May 16 20:29:42 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 16 23:30:29 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c73aabb3 |
7 |
|
8 |
media-libs/libuninameslist: Add 20211114 |
9 |
|
10 |
The patch fixes undefined references with slibtool when libuninameslist |
11 |
is not already installed where it links with the installed package |
12 |
rather than the newly compiled library. |
13 |
|
14 |
The other bug was already fixed in upstream before the latest release. |
15 |
|
16 |
Bug: https://bugs.gentoo.org/792474 |
17 |
Upstream-PR: https://github.com/fontforge/libuninameslist/pull/27 |
18 |
Upstream-Commit: https://github.com/fontforge/libuninameslist/commit/77f4eea51b87c2e7a36cd3e1e64b424cdd5f7ad8 |
19 |
|
20 |
Bug: https://bugs.gentoo.org/779670 |
21 |
Upstream-PR: https://github.com/fontforge/libuninameslist/pull/24 |
22 |
Upstream-Commit: https://github.com/fontforge/libuninameslist/commit/9192c8dfee8c9e437e841962fec78cba1093d0d6 |
23 |
|
24 |
Signed-off-by: orbea <orbea <AT> riseup.net> |
25 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
26 |
|
27 |
media-libs/libuninameslist/Manifest | 1 + |
28 |
.../files/libuninameslist-20211114-slibtool.patch | 64 ++++++++++++++++++++++ |
29 |
.../libuninameslist-20211114.ebuild | 32 +++++++++++ |
30 |
3 files changed, 97 insertions(+) |
31 |
|
32 |
diff --git a/media-libs/libuninameslist/Manifest b/media-libs/libuninameslist/Manifest |
33 |
index 41b1d12d1014..c2b28641b4fb 100644 |
34 |
--- a/media-libs/libuninameslist/Manifest |
35 |
+++ b/media-libs/libuninameslist/Manifest |
36 |
@@ -1,2 +1,3 @@ |
37 |
DIST libuninameslist-20091231.tar.bz2 568820 BLAKE2B 09574729cc8b655bc9921c49b6f81a7c242a761d70865a0ca6b9ef479582f158f05580e81b94100994ede623ebf8e16f482ae2bacbd596d195b2201023a8ee7e SHA512 3780759428ef2bf2fd808de6ea87a44cf85952f926240ea355d692ef08b5e50c1cf068a2ee05b00cf0fc6b725d71142306aae01e9d6e5144291f6e5dc4505bc2 |
38 |
DIST libuninameslist-dist-20200413.tar.gz 1210689 BLAKE2B 10577d930e4f1e2d8dc41d7df684b63897f62dae31d0bb2208b26ec9102ecc2fd0181d7d3d05c6c678de69b4f379805bfcbf0a484fd0076ff65ee2fa1e9d1368 SHA512 88befff4bf7efed149b4e3a5d58a733b2cb6477e103ec34529ff02a88f8c72a6fc9d7b0be9e97cd539a75c8ebe5e4127cdf03a568da2f219157174b9b585b2a3 |
39 |
+DIST libuninameslist-dist-20211114.tar.gz 1247578 BLAKE2B dd96a81c87e214b7b53549ecfcc0b79388a51218f3e6ecb64786d9acc4c540838e2679c4c0f634c94ca55271bb9f3a4350918bd0071c89dbebbd993758ab5314 SHA512 febd0fafe836a85148aa7ceb87888a5882e7c27968c20595026cd947e9e6c1d0246d6e585510377f0e561d36a194d129df302143c67f59dd3b82aa3d30190acb |
40 |
|
41 |
diff --git a/media-libs/libuninameslist/files/libuninameslist-20211114-slibtool.patch b/media-libs/libuninameslist/files/libuninameslist-20211114-slibtool.patch |
42 |
new file mode 100644 |
43 |
index 000000000000..9a3edd736137 |
44 |
--- /dev/null |
45 |
+++ b/media-libs/libuninameslist/files/libuninameslist-20211114-slibtool.patch |
46 |
@@ -0,0 +1,64 @@ |
47 |
+Upstream-PR: https://github.com/fontforge/libuninameslist/pull/27 |
48 |
+From 77f4eea51b87c2e7a36cd3e1e64b424cdd5f7ad8 Mon Sep 17 00:00:00 2001 |
49 |
+From: orbea <orbea@××××××.net> |
50 |
+Date: Fri, 13 May 2022 21:57:38 -0700 |
51 |
+Subject: [PATCH] build: Link with .la files for internal deps |
52 |
+ |
53 |
+When building libuninameslist with --enable-frenchlib and slibtool the |
54 |
+build will fail when it can't find -luninameslist-fr. |
55 |
+ |
56 |
+However if libuninameslist is already installed to the system it will |
57 |
+compile successfully using the already installed version of |
58 |
+uninameslist-fr.so instead of the locally built new library. |
59 |
+ |
60 |
+This can be fixed by linking with the libtool archive (.la) instead as |
61 |
+should be done for internal dependencies while -l linker flags should be |
62 |
+only for external dependencies. |
63 |
+ |
64 |
+Additionally I removed the now redundant DEPENDENCIES and LIBADD line. |
65 |
+ |
66 |
+GNU libtool is less strict about user errors and will silently hide such |
67 |
+issues. |
68 |
+ |
69 |
+I missed this second issue until now when I fixed the previous issue in |
70 |
+PR https://github.com/fontforge/libuninameslist/pull/24. |
71 |
+ |
72 |
+Gentoo Bugs: |
73 |
+ https://bugs.gentoo.org/779670 |
74 |
+ https://bugs.gentoo.org/792474 |
75 |
+--- |
76 |
+ Makefile.am | 8 ++------ |
77 |
+ 1 file changed, 2 insertions(+), 6 deletions(-) |
78 |
+ |
79 |
+diff --git a/Makefile.am b/Makefile.am |
80 |
+index f9fe87c..68c64db 100644 |
81 |
+--- a/Makefile.am |
82 |
++++ b/Makefile.am |
83 |
+@@ -44,25 +44,21 @@ lib_LTLIBRARIES += libuninameslist.la |
84 |
+ |
85 |
+ include_HEADERS = uninameslist.h |
86 |
+ libuninameslist_la_LIBADD = |
87 |
+-EXTRA_libuninameslist_la_DEPENDENCIES = |
88 |
+ man_MANS = libuninameslist.3 |
89 |
+ noinst_HEADERS = nameslist-dll.h |
90 |
+-LIBADD = |
91 |
+ |
92 |
+ if WANTLIBOFR |
93 |
+ include_HEADERS += uninameslist-fr.h |
94 |
+ libuninameslist_fr_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(FR_VERSION) |
95 |
+ libuninameslist_fr_la_SOURCES = nameslist-fr.c |
96 |
+ libuninameslist_fr_la.$(OBJEXT): uninameslist-fr.h nameslist-dll.h buildnameslist.h |
97 |
+-libuninameslist_la_LIBADD += -luninameslist-fr |
98 |
+-EXTRA_libuninameslist_la_DEPENDENCIES += libuninameslist-fr.la |
99 |
++libuninameslist_la_LIBADD += libuninameslist-fr.la |
100 |
+ man_MANS += libuninameslist-fr.3 |
101 |
+-LIBADD += -luninameslist-fr |
102 |
+ else |
103 |
+ EXTRA_DIST += nameslist-fr.c uninameslist-fr.h libuninameslist-fr.3 |
104 |
+ endif |
105 |
+ |
106 |
+-libuninameslist_la_LDFLAGS = $(AM_LDFLAGS) $(LIBADD) -version-info $(UN_VERSION) |
107 |
++libuninameslist_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(UN_VERSION) |
108 |
+ libuninameslist_la_SOURCES = nameslist.c |
109 |
+ libuninameslist_la.$(OBJEXT): uninameslist.h nameslist-dll.h buildnameslist.h |
110 |
+ |
111 |
|
112 |
diff --git a/media-libs/libuninameslist/libuninameslist-20211114.ebuild b/media-libs/libuninameslist/libuninameslist-20211114.ebuild |
113 |
new file mode 100644 |
114 |
index 000000000000..d237b6cedd16 |
115 |
--- /dev/null |
116 |
+++ b/media-libs/libuninameslist/libuninameslist-20211114.ebuild |
117 |
@@ -0,0 +1,32 @@ |
118 |
+# Copyright 1999-2022 Gentoo Authors |
119 |
+# Distributed under the terms of the GNU General Public License v2 |
120 |
+ |
121 |
+EAPI=8 |
122 |
+ |
123 |
+inherit autotools |
124 |
+ |
125 |
+DESCRIPTION="Library of unicode annotation data" |
126 |
+HOMEPAGE="https://github.com/fontforge/libuninameslist" |
127 |
+SRC_URI="https://github.com/fontforge/libuninameslist/releases/download/${PV}/${PN}-dist-${PV}.tar.gz" |
128 |
+ |
129 |
+LICENSE="BSD" |
130 |
+SLOT="0/1" |
131 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" |
132 |
+ |
133 |
+PATCHES=( |
134 |
+ "${FILESDIR}/${P}-slibtool.patch" # 792474 |
135 |
+) |
136 |
+ |
137 |
+src_prepare() { |
138 |
+ default |
139 |
+ eautoreconf |
140 |
+} |
141 |
+ |
142 |
+src_configure() { |
143 |
+ econf --disable-static --enable-frenchlib |
144 |
+} |
145 |
+ |
146 |
+src_install() { |
147 |
+ default |
148 |
+ find "${ED}"/usr -name '*.la' -delete || die |
149 |
+} |