From 7b56f76d85ea363d9f84e6102e0860b6e25f05fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Efe=20=C4=B0zbudak?= Date: Mon, 29 Aug 2022 20:06:31 -0400 Subject: [PATCH] dev-libs/libxlsxwriter: fixes pkg-config file ver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The xlsxwriter.pc had incorrect version because of greedy dot star. The issue is fixed upstream, this patch should do before there is a new version. Bug: https://bugs.gentoo.org/859745 Signed-off-by: Efe İzbudak Closes: https://github.com/gentoo/gentoo/pull/27065 Signed-off-by: Sam James --- ...lsxwriter-1.1.4-fix-pkgconfig-version.patch | 18 ++++++++++++++++++ ....4.ebuild => libxlsxwriter-1.1.4-r1.ebuild} | 4 ++++ 2 files changed, 22 insertions(+) create mode 100644 dev-libs/libxlsxwriter/files/libxlsxwriter-1.1.4-fix-pkgconfig-version.patch rename dev-libs/libxlsxwriter/{libxlsxwriter-1.1.4.ebuild => libxlsxwriter-1.1.4-r1.ebuild} (94%) diff --git a/dev-libs/libxlsxwriter/files/libxlsxwriter-1.1.4-fix-pkgconfig-version.patch b/dev-libs/libxlsxwriter/files/libxlsxwriter-1.1.4-fix-pkgconfig-version.patch new file mode 100644 index 0000000000000..a66ea82e944e8 --- /dev/null +++ b/dev-libs/libxlsxwriter/files/libxlsxwriter-1.1.4-fix-pkgconfig-version.patch @@ -0,0 +1,18 @@ +Patch greedy dot star to fix mismatched pkg-config file version. +Fixed upstream with: https://github.com/jmcnamara/libxlsxwriter/commit/12afb351db634ed9452eb2f38d68883a9538b8ef +https://bugs.gentoo.org/859745 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -202,9 +202,9 @@ + # Configure pkg-config + file(READ "include/xlsxwriter.h" ver) + +-string(REGEX MATCH "LXW_VERSION .*\"\(.*\)\".*" _ ${ver}) ++string(REGEX MATCH "LXW_VERSION \"([^\"]+)\"" _ ${ver}) + set(VERSION ${CMAKE_MATCH_1}) +-string(REGEX MATCH "LXW_SOVERSION .*\"\(.*\)\".*" _ ${ver}) ++string(REGEX MATCH "LXW_SOVERSION \"([^\"]+)\"" _ ${ver}) + set(SOVERSION ${CMAKE_MATCH_1}) + set(PREFIX ${CMAKE_INSTALL_PREFIX}) + diff --git a/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4.ebuild b/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4-r1.ebuild similarity index 94% rename from dev-libs/libxlsxwriter/libxlsxwriter-1.1.4.ebuild rename to dev-libs/libxlsxwriter/libxlsxwriter-1.1.4-r1.ebuild index c31861ee337bc..3006dcf4e7cd3 100644 --- a/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4.ebuild +++ b/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4-r1.ebuild @@ -21,6 +21,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-fix-pkgconfig-version.patch +) + src_configure() { DOUBLEFUNCTION=OFF for x in $(plocale_get_locales); do