From 0c1bebc4027c639909ad0a840068b649b6be4b95 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 29 Feb 2024 17:41:08 +0000 Subject: gentoo auto-resync : 29:02:2024 - 17:41:08 --- dev-libs/libtermkey/Manifest | 2 +- .../libtermkey/files/libtermkey-0.22-libtool.patch | 28 ++++++++++++---------- 2 files changed, 17 insertions(+), 13 deletions(-) (limited to 'dev-libs/libtermkey') diff --git a/dev-libs/libtermkey/Manifest b/dev-libs/libtermkey/Manifest index 2566de2aa01e..e33ba030892d 100644 --- a/dev-libs/libtermkey/Manifest +++ b/dev-libs/libtermkey/Manifest @@ -1,4 +1,4 @@ -AUX libtermkey-0.22-libtool.patch 2391 BLAKE2B d228b94f47ca703fa1edbf0da8e9e33a96a132d61e60e0242edc6a01613946e0934bc716c4e062f18433a8549d9c61162c7c2e545004ca3f61c430b22f05e422 SHA512 de4f48d86803314dbf9d4982a345452538b6985189359df8f9afc03f3c4e015628fdc73927a9bef503fabde5d8adb3ed188cafd16f7b318c76669b798a15c52a +AUX libtermkey-0.22-libtool.patch 2490 BLAKE2B 431692551e1345b2b1abe8fc38c58014c572be238462bda3b43329fe4e3f4ef1582a7a249ec21a3911ff9a07e4dd898052a90a5aeb2debbfca046d18e4e5a3bd SHA512 a3751d025d980095e4355709a970764cd7e5917030faa5972852acc287fdd472a7fcd273be6075cd3cda916bfc83991478543ba92f3b53d6e11e0e9a6ee9ff83 AUX no-automagic-manpages-compress.patch 498 BLAKE2B c803a33a5a0b8b0c4240ba05a0a9159921a32daa2e86396e85f98acaad26d22cbff814e54e4a96fab4ecfe682a4788bd7dfc263345626617064b76d60c1f0e1a SHA512 d44bc11b6ab9e30ac594982f1f2c139c7806287cd759d106f133010627201874fe8d8290b63835c240fcd0da144455f5b1e63fad8867704c3044da174189e171 DIST libtermkey-0.22.tar.gz 46147 BLAKE2B fddc00a1ae525e5ed8c9c6eaee46fe30a99dbbc76ca988f9f5301b3c5c13a6de4462d6cc612119409a21737176f67ac196109b11fb58f414b25db5b6a49f4982 SHA512 2e8242cd1e6acb8900125dcee9fd47f7554c359363f760b88858c82667e1f3871bdd87358b14c8a133ef3cd2699947a5045477e64cdf7f96d4ead1723e73a219 EBUILD libtermkey-0.22-r1.ebuild 1127 BLAKE2B 3ce89f1287691c4f39d5df995149f8e1f98edef8768a58439289175fd06684289e71ad7b353788ee62762102e086d9d984f552ba2bdd8db6ada4d7839b3a8cfa SHA512 0e435beda2a1f7696967b189da3923c1bbb8e832592dd3f8a33e32705688b41159d8b4b42c9676f582f1fc5329b0ee18a5535f7eea9f7fad7e42ed95aa500dd8 diff --git a/dev-libs/libtermkey/files/libtermkey-0.22-libtool.patch b/dev-libs/libtermkey/files/libtermkey-0.22-libtool.patch index d3d79ccc0c95..913eb912289f 100644 --- a/dev-libs/libtermkey/files/libtermkey-0.22-libtool.patch +++ b/dev-libs/libtermkey/files/libtermkey-0.22-libtool.patch @@ -1,8 +1,8 @@ Upstream is archived: https://github.com/neovim/libtermkey -From f3316ec933d618352ee9c6b1f1ef354c8896372e Mon Sep 17 00:00:00 2001 +From df7da7e0beb467b97e25e4222f723fbdff369a95 Mon Sep 17 00:00:00 2001 From: orbea -Date: Thu, 7 Sep 2023 09:52:10 -0700 +Date: Wed, 28 Feb 2024 15:35:06 -0500 Subject: [PATCH] build: Add a minimal configure.ac When building with slibtool using the rlibtool symlink the build will @@ -12,23 +12,24 @@ rlibtool can determine if it should build shared or static libraries. This can be fixed by adding a minimal configure.ac that can generate the required files with autoreconf. -Gentoo Bug: https://bugs.gentoo.org/913482 +Bug: https://bugs.gentoo.org/913482 --- - Makefile => Makefile.in | 29 +++++++++++++++-------------- - configure.ac | 14 ++++++++++++++ - 2 files changed, 29 insertions(+), 14 deletions(-) - rename Makefile => Makefile.in (91%) + Makefile => Makefile.in | 31 ++++++++++++++++--------------- + configure.ac | 16 ++++++++++++++++ + 2 files changed, 32 insertions(+), 15 deletions(-) + rename Makefile => Makefile.in (89%) create mode 100644 configure.ac diff --git a/Makefile b/Makefile.in -similarity index 91% +similarity index 89% rename from Makefile rename to Makefile.in -index 199f143..8f12b07 100644 +index 199f143..f59265b 100644 --- a/Makefile +++ b/Makefile.in @@ -1,14 +1,10 @@ - pkgconfig = $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config $(1)) +-pkgconfig = $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config $(1)) ++pkgconfig = $(shell PKG_CONFIG_PATH=@PKG_CONFIG_PATH@ @PKG_CONFIG@ $(1)) -ifeq ($(shell uname),Darwin) - LIBTOOL ?= glibtool @@ -79,10 +80,10 @@ index 199f143..8f12b07 100644 diff --git a/configure.ac b/configure.ac new file mode 100644 -index 0000000..46fe30e +index 0000000..fdf86ce --- /dev/null +++ b/configure.ac -@@ -0,0 +1,14 @@ +@@ -0,0 +1,16 @@ +m4_define([MAJOR], [0]) +m4_define([MINOR], [22]) + @@ -91,9 +92,12 @@ index 0000000..46fe30e + +LT_INIT + ++PKG_PROG_PKG_CONFIG ++ +AC_SUBST([top_builddir], [$abs_builddir]) + +AC_SUBST([MAJOR], [MAJOR]) +AC_SUBST([MINOR], [MINOR]) + +AC_OUTPUT +-- -- cgit v1.2.3