| 1 |
commit: 7b56f76d85ea363d9f84e6102e0860b6e25f05fa |
| 2 |
Author: Efe İzbudak <efe.izbudak <AT> metu <DOT> edu <DOT> tr> |
| 3 |
AuthorDate: Tue Aug 30 00:06:31 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 31 02:52:42 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b56f76d |
| 7 |
|
| 8 |
dev-libs/libxlsxwriter: fixes pkg-config file ver |
| 9 |
|
| 10 |
The xlsxwriter.pc had incorrect version because of |
| 11 |
greedy dot star. The issue is fixed upstream, this |
| 12 |
patch should do before there is a new version. |
| 13 |
|
| 14 |
Bug: https://bugs.gentoo.org/859745 |
| 15 |
Signed-off-by: Efe İzbudak <efe.izbudak <AT> metu.edu.tr> |
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/27065 |
| 17 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 18 |
|
| 19 |
.../libxlsxwriter-1.1.4-fix-pkgconfig-version.patch | 18 ++++++++++++++++++ |
| 20 |
...iter-1.1.4.ebuild => libxlsxwriter-1.1.4-r1.ebuild} | 4 ++++ |
| 21 |
2 files changed, 22 insertions(+) |
| 22 |
|
| 23 |
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 |
| 24 |
new file mode 100644 |
| 25 |
index 000000000000..a66ea82e944e |
| 26 |
--- /dev/null |
| 27 |
+++ b/dev-libs/libxlsxwriter/files/libxlsxwriter-1.1.4-fix-pkgconfig-version.patch |
| 28 |
@@ -0,0 +1,18 @@ |
| 29 |
+Patch greedy dot star to fix mismatched pkg-config file version. |
| 30 |
+Fixed upstream with: https://github.com/jmcnamara/libxlsxwriter/commit/12afb351db634ed9452eb2f38d68883a9538b8ef |
| 31 |
+https://bugs.gentoo.org/859745 |
| 32 |
+ |
| 33 |
+--- a/CMakeLists.txt |
| 34 |
++++ b/CMakeLists.txt |
| 35 |
+@@ -202,9 +202,9 @@ |
| 36 |
+ # Configure pkg-config |
| 37 |
+ file(READ "include/xlsxwriter.h" ver) |
| 38 |
+ |
| 39 |
+-string(REGEX MATCH "LXW_VERSION .*\"\(.*\)\".*" _ ${ver}) |
| 40 |
++string(REGEX MATCH "LXW_VERSION \"([^\"]+)\"" _ ${ver}) |
| 41 |
+ set(VERSION ${CMAKE_MATCH_1}) |
| 42 |
+-string(REGEX MATCH "LXW_SOVERSION .*\"\(.*\)\".*" _ ${ver}) |
| 43 |
++string(REGEX MATCH "LXW_SOVERSION \"([^\"]+)\"" _ ${ver}) |
| 44 |
+ set(SOVERSION ${CMAKE_MATCH_1}) |
| 45 |
+ set(PREFIX ${CMAKE_INSTALL_PREFIX}) |
| 46 |
+ |
| 47 |
|
| 48 |
diff --git a/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4.ebuild b/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4-r1.ebuild |
| 49 |
similarity index 94% |
| 50 |
rename from dev-libs/libxlsxwriter/libxlsxwriter-1.1.4.ebuild |
| 51 |
rename to dev-libs/libxlsxwriter/libxlsxwriter-1.1.4-r1.ebuild |
| 52 |
index c31861ee337b..3006dcf4e7cd 100644 |
| 53 |
--- a/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4.ebuild |
| 54 |
+++ b/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4-r1.ebuild |
| 55 |
@@ -21,6 +21,10 @@ DEPEND=" |
| 56 |
" |
| 57 |
RDEPEND="${DEPEND}" |
| 58 |
|
| 59 |
+PATCHES=( |
| 60 |
+ "${FILESDIR}"/${P}-fix-pkgconfig-version.patch |
| 61 |
+) |
| 62 |
+ |
| 63 |
src_configure() { |
| 64 |
DOUBLEFUNCTION=OFF |
| 65 |
for x in $(plocale_get_locales); do |
Archives