From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8A2B1158086 for ; Sat, 9 Oct 2021 06:54:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DDF0BE07F0; Sat, 9 Oct 2021 06:54:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C60BEE07A5 for ; Sat, 9 Oct 2021 06:54:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CB513343012 for ; Sat, 9 Oct 2021 06:54:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4DEAA116 for ; Sat, 9 Oct 2021 06:54:19 +0000 (UTC) From: "Akinori Hattori" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Akinori Hattori" Message-ID: <1633762449.2ca8942c4c8623d146fdf6543f84ab662d0584a7.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/libkkc/files/, app-i18n/libkkc/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/libkkc/files/libkkc-marisa-glib.patch app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild app-i18n/libkkc/libkkc-9999.ebuild X-VCS-Directories: app-i18n/libkkc/files/ app-i18n/libkkc/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: 2ca8942c4c8623d146fdf6543f84ab662d0584a7 X-VCS-Branch: master Date: Sat, 9 Oct 2021 06:54:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 81e80d01-b311-4230-9b2e-0ba3a7d0936a X-Archives-Hash: 62d93a726b2ecdf88196d07790d254a1 commit: 2ca8942c4c8623d146fdf6543f84ab662d0584a7 Author: Akinori Hattori gentoo org> AuthorDate: Sat Oct 9 06:43:20 2021 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Sat Oct 9 06:54:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ca8942c app-i18n/libkkc: fix link with gold Closes: https://bugs.gentoo.org/746482 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Akinori Hattori gentoo.org> app-i18n/libkkc/files/libkkc-marisa-glib.patch | 23 ++++++++++++++++++++++ .../libkkc/libkkc-0.3.6_pre20190809104047.ebuild | 2 ++ app-i18n/libkkc/libkkc-9999.ebuild | 2 ++ 3 files changed, 27 insertions(+) diff --git a/app-i18n/libkkc/files/libkkc-marisa-glib.patch b/app-i18n/libkkc/files/libkkc-marisa-glib.patch new file mode 100644 index 00000000000..2b013d4f577 --- /dev/null +++ b/app-i18n/libkkc/files/libkkc-marisa-glib.patch @@ -0,0 +1,23 @@ +--- a/libkkc/Makefile.am ++++ b/libkkc/Makefile.am +@@ -49,7 +49,11 @@ + -DLOCALEDIR=\"$(datadir)/locale\" \ + -I $(top_srcdir) \ + $(NULL) +-libkkc_la_LIBADD = $(LIBKKC_LIBS) $(top_builddir)/marisa-glib/libmarisa-glib.la ++libkkc_la_LIBADD = \ ++ $(LIBKKC_LIBS) \ ++ $(top_builddir)/marisa-glib/libmarisa-glib.la \ ++ $(MARISA_GLIB_STATIC_DEPENDENCIES) \ ++ $(NULL) + libkkc_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" \ +@@ -66,7 +70,6 @@ + libkkc_internals_la_LIBADD = \ + $(libkkc_la_LIBADD) \ + $(libkkc_la_OBJECTS) \ +- $(MARISA_GLIB_STATIC_DEPENDENCIES) \ + $(NULL) + libkkc_internals_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ diff --git a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild b/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild index 16e4031c08f..d3a6f2f23e2 100644 --- a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild +++ b/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild @@ -43,6 +43,8 @@ BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]') virtual/pkgconfig nls? ( sys-devel/gettext )" +PATCHES=( "${FILESDIR}"/${PN}-marisa-glib.patch ) + python_check_deps() { has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]" } diff --git a/app-i18n/libkkc/libkkc-9999.ebuild b/app-i18n/libkkc/libkkc-9999.ebuild index cd65127fb1e..bd968d1693d 100644 --- a/app-i18n/libkkc/libkkc-9999.ebuild +++ b/app-i18n/libkkc/libkkc-9999.ebuild @@ -43,6 +43,8 @@ BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]') virtual/pkgconfig nls? ( sys-devel/gettext )" +PATCHES=( "${FILESDIR}"/${PN}-marisa-glib.patch ) + python_check_deps() { has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]" }