public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libuninameslist/files/, media-libs/libuninameslist/
@ 2021-05-27  2:06 Naohiro Aota
  0 siblings, 0 replies; 3+ messages in thread
From: Naohiro Aota @ 2021-05-27  2:06 UTC (permalink / raw
  To: gentoo-commits

commit:     79dfca2512dbaaf7e133e629f27cf2815a8477e0
Author:     Naohiro Aota <naota <AT> gentoo <DOT> org>
AuthorDate: Thu May 27 02:00:23 2021 +0000
Commit:     Naohiro Aota <naota <AT> gentoo <DOT> org>
CommitDate: Thu May 27 02:05:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79dfca25

media-libs/libuninameslist: enable french lib

This commit enable frenclib to fix build with -O0 (undefined references).

Enabling french lib caused parallel make issue, so Makefile.am is also
patched.

Closes: https://bugs.gentoo.org/781716
Signed-off-by: Naohiro Aota <naota <AT> gentoo.org>

 .../files/libuninameslist-20200413-makefile.patch  | 20 ++++++++++++++
 .../libuninameslist-20200413-r2.ebuild             | 32 ++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/media-libs/libuninameslist/files/libuninameslist-20200413-makefile.patch b/media-libs/libuninameslist/files/libuninameslist-20200413-makefile.patch
new file mode 100644
index 00000000000..fc9c24329a4
--- /dev/null
+++ b/media-libs/libuninameslist/files/libuninameslist-20200413-makefile.patch
@@ -0,0 +1,20 @@
+diff --git a/Makefile.am b/Makefile.am
+index 98be02ca26c8..848bc6c8269b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -44,6 +44,7 @@ lib_LTLIBRARIES += libuninameslist.la
+ 
+ include_HEADERS = uninameslist.h
+ libuninameslist_la_LIBADD =
++EXTRA_libuninameslist_la_DEPENDENCIES =
+ man_MANS = libuninameslist.3
+ noinst_HEADERS = nameslist-dll.h
+ 
+@@ -53,6 +54,7 @@ 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
+ libuninameslist_la_LIBADD += -luninameslist-fr
++EXTRA_libuninameslist_la_DEPENDENCIES += libuninameslist-fr.la
+ man_MANS += libuninameslist-fr.3
+ else
+ EXTRA_DIST += nameslist-fr.c uninameslist-fr.h libuninameslist-fr.3

diff --git a/media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild b/media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild
new file mode 100644
index 00000000000..f83f0bcf85a
--- /dev/null
+++ b/media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20200413-makefile.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static --enable-frenchlib
+}
+
+src_install() {
+	default
+	find "${ED}"/usr -name '*.la' -delete || die
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/libuninameslist/files/, media-libs/libuninameslist/
@ 2022-08-18  2:53 Matt Turner
  0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2022-08-18  2:53 UTC (permalink / raw
  To: gentoo-commits

commit:     f284821835927e39f7d0e6c853bc9301b0563e4d
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 02:36:03 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 02:53:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2848218

media-libs/libuninameslist: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/libuninameslist/Manifest                |  1 -
 .../files/libuninameslist-20200413-makefile.patch  | 20 --------------
 .../libuninameslist-20200413-r1.ebuild             | 21 --------------
 .../libuninameslist-20200413-r2.ebuild             | 32 ----------------------
 4 files changed, 74 deletions(-)

diff --git a/media-libs/libuninameslist/Manifest b/media-libs/libuninameslist/Manifest
index a8b0c3c33ab6..a4b9a407c175 100644
--- a/media-libs/libuninameslist/Manifest
+++ b/media-libs/libuninameslist/Manifest
@@ -1,2 +1 @@
-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-20200413-makefile.patch b/media-libs/libuninameslist/files/libuninameslist-20200413-makefile.patch
deleted file mode 100644
index fc9c24329a4d..000000000000
--- a/media-libs/libuninameslist/files/libuninameslist-20200413-makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 98be02ca26c8..848bc6c8269b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -44,6 +44,7 @@ lib_LTLIBRARIES += libuninameslist.la
- 
- include_HEADERS = uninameslist.h
- libuninameslist_la_LIBADD =
-+EXTRA_libuninameslist_la_DEPENDENCIES =
- man_MANS = libuninameslist.3
- noinst_HEADERS = nameslist-dll.h
- 
-@@ -53,6 +54,7 @@ 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
- libuninameslist_la_LIBADD += -luninameslist-fr
-+EXTRA_libuninameslist_la_DEPENDENCIES += libuninameslist-fr.la
- man_MANS += libuninameslist-fr.3
- else
- EXTRA_DIST += nameslist-fr.c uninameslist-fr.h libuninameslist-fr.3

diff --git a/media-libs/libuninameslist/libuninameslist-20200413-r1.ebuild b/media-libs/libuninameslist/libuninameslist-20200413-r1.ebuild
deleted file mode 100644
index e09f527ea01e..000000000000
--- a/media-libs/libuninameslist/libuninameslist-20200413-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${ED}"/usr -name '*.la' -delete || die
-}

diff --git a/media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild b/media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild
deleted file mode 100644
index fce8a10ceeb4..000000000000
--- a/media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}/${PN}-20200413-makefile.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static --enable-frenchlib
-}
-
-src_install() {
-	default
-	find "${ED}"/usr -name '*.la' -delete || die
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/libuninameslist/files/, media-libs/libuninameslist/
@ 2023-12-01  0:11 Matt Turner
  0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2023-12-01  0:11 UTC (permalink / raw
  To: gentoo-commits

commit:     38d327c4b96d0d88af677dfabc25c3589dd01d7b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  1 00:02:33 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Dec  1 00:11:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d327c4

media-libs/libuninameslist: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/libuninameslist/Manifest                |  1 -
 .../files/libuninameslist-20211114-slibtool.patch  | 64 ----------------------
 .../libuninameslist-20211114.ebuild                | 33 -----------
 3 files changed, 98 deletions(-)

diff --git a/media-libs/libuninameslist/Manifest b/media-libs/libuninameslist/Manifest
index 43fc4a7d231d..bda654a0e99f 100644
--- a/media-libs/libuninameslist/Manifest
+++ b/media-libs/libuninameslist/Manifest
@@ -1,3 +1,2 @@
-DIST libuninameslist-dist-20211114.tar.gz 1247578 BLAKE2B dd96a81c87e214b7b53549ecfcc0b79388a51218f3e6ecb64786d9acc4c540838e2679c4c0f634c94ca55271bb9f3a4350918bd0071c89dbebbd993758ab5314 SHA512 febd0fafe836a85148aa7ceb87888a5882e7c27968c20595026cd947e9e6c1d0246d6e585510377f0e561d36a194d129df302143c67f59dd3b82aa3d30190acb
 DIST libuninameslist-dist-20221022.tar.gz 1254897 BLAKE2B 36f096f5d8ac81f7bbea019ecb980d7faa1cdaa457f2e51986453d7e7bddc9b18cb5db59c1f01d604e2b727b68435acd51c9d5aafb983a04a615869be9bf1329 SHA512 089306ee544f2bf233b6f7acef569bc8503c291cb35243fa84eff5ba3253cf85505d64b43d8625aca7d2da433b2d2a09f4c6ba7e307d2be106c16df9eef3e5c9
 DIST libuninameslist-dist-20230916.tar.gz 1265244 BLAKE2B 53624158de02d467b9a524f9334de11abe5e46eee4e40e9834c6d9343dc1464600d74ec89709c362f0ab6496756535696cbd9b3d2642d27ece06da0a2e9f69c8 SHA512 32d5c59b0bdc07332dc24d4d6adc4f9173c8e9f41cad1adf1c6f5b9dd0ef8dd62a4ca3c8151d8ef4b5cb7f9ea4df63d8b63e906658b7d7062c5a17edd452c3e5

diff --git a/media-libs/libuninameslist/files/libuninameslist-20211114-slibtool.patch b/media-libs/libuninameslist/files/libuninameslist-20211114-slibtool.patch
deleted file mode 100644
index 9a3edd736137..000000000000
--- a/media-libs/libuninameslist/files/libuninameslist-20211114-slibtool.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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
deleted file mode 100644
index 18e42ca50018..000000000000
--- a/media-libs/libuninameslist/libuninameslist-20211114.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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"
-
-PATCHES=(
-	"${FILESDIR}/${P}-slibtool.patch" # 792474
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-frenchlib
-}
-
-src_install() {
-	default
-	find "${ED}"/usr -name '*.la' -delete || die
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-12-01  0:11 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-18  2:53 [gentoo-commits] repo/gentoo:master commit in: media-libs/libuninameslist/files/, media-libs/libuninameslist/ Matt Turner
  -- strict thread matches above, loose matches on Subject: below --
2023-12-01  0:11 Matt Turner
2021-05-27  2:06 Naohiro Aota

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