diff options
| author |   Efe İzbudak <efe.izbudak@metu.edu.tr> | 2022-08-29 20:06:31 -0400 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-08-31 03:52:42 +0100 |
| commit | 7b56f76d85ea363d9f84e6102e0860b6e25f05fa (patch) | |
| tree | 280da0cfe4a649259af27d46c1b87ceaa51e1d8e | |
| parent | media-gfx/imagemagick: drop 6.9.12.28, 6.9.12.58, 7.1.0.13, 7.1.0.43 (diff) | |
| download | gentoo-7b56f76d85ea363d9f84e6102e0860b6e25f05fa.tar.gz gentoo-7b56f76d85ea363d9f84e6102e0860b6e25f05fa.tar.bz2 gentoo-7b56f76d85ea363d9f84e6102e0860b6e25f05fa.zip | |
dev-libs/libxlsxwriter: fixes pkg-config file ver
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 <efe.izbudak@metu.edu.tr>
Closes: https://github.com/gentoo/gentoo/pull/27065
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | dev-libs/libxlsxwriter/files/libxlsxwriter-1.1.4-fix-pkgconfig-version.patch | 18 | ||||
| -rw-r--r-- | dev-libs/libxlsxwriter/libxlsxwriter-1.1.4-r1.ebuild (renamed from dev-libs/libxlsxwriter/libxlsxwriter-1.1.4.ebuild) | 4 |
2 files changed, 22 insertions, 0 deletions
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 000000000000..a66ea82e944e --- /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 index c31861ee337b..3006dcf4e7cd 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 |