diff options
Diffstat (limited to 'dev-libs/libxlsxwriter')
-rw-r--r-- | dev-libs/libxlsxwriter/Manifest | 3 | ||||
-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 |
3 files changed, 24 insertions, 1 deletions
diff --git a/dev-libs/libxlsxwriter/Manifest b/dev-libs/libxlsxwriter/Manifest index ed606011aa30..3f6e715c0d7a 100644 --- a/dev-libs/libxlsxwriter/Manifest +++ b/dev-libs/libxlsxwriter/Manifest @@ -1,3 +1,4 @@ +AUX libxlsxwriter-1.1.4-fix-pkgconfig-version.patch 675 BLAKE2B 19771b0b921a613191695ab0dfc65dabf3941678df01e7241cc37b5dcb9544c59f917d9d0090781e525708b4e1fa314cd49b6887c9915e809f4111b3fe0d2831 SHA512 dd43e9b8738298dbf568f9fe7cc518ff44ecd352a01554af776506be6c815e51c954195f4bcd046dfeb35ced4d590824f4dc26881f03a70639486f8fee768797 DIST libxlsxwriter-1.1.4.tar.gz 20442200 BLAKE2B 38308dd8e954820b6debf15bc884effd583c0e0fa1667ed4451085ff8cf1bf4101807110873a501617785763886c107c19ab30c16390b5fb608f52b2736465be SHA512 fad36f7882fcb21b87e13cf603022cfad3f14e6f955a06e2771712facd0fe12f83f4d1655dc1a744724bda1ac83af7e7bf1393457c5507d8983f63002ab294b5 -EBUILD libxlsxwriter-1.1.4.ebuild 1043 BLAKE2B ab85b1f43163662c721c2092190cfa6aebaf7cb8cbe46f46325410acf13b5aaaf18615204e36a09f6c9add6bcb2077c0b8a60b02bd0fa629eb3beb53961a4b83 SHA512 f6ce8cabce1adc0e6a98efa679e229aaa67d7aa47ee40777d290c1742f797e5b2185cb5c89bc145c0890d512c2105fec6405b107e27cdcd0dd63eef69ee0fb9a +EBUILD libxlsxwriter-1.1.4-r1.ebuild 1104 BLAKE2B 8d8af2a9e607ed73d0252872c63d488bdfa4fae17d14264f50551fbc5911a751d634d028d384d6b6a0af714eb0c0a3112d1b30032a5462f85f14cc6bed523b38 SHA512 bea6d68ae84c21b7c829f8476a0093265a160c18bcf959ed296dccd8db85997b42066f37b10f2130290cdd84b9ac574391ab86e1e7729f586fc8d9e6f525b4bb MISC metadata.xml 579 BLAKE2B 0c3294a1f69d9cc7e3e95a37f2708ce4672cc931f28cdded82aadc9cdffb323ac4bd7518c61fee57ad30022617acb572625f3b6b0972fd903a1ae3afcf98aee1 SHA512 83d288575e27337692c3cd94bad56d8e2882240343b739eeed72742bd82e9177c45a81ef94ebab9e035b99431ecc2cf21723e408a90fa6b5f551e8a7f1f17a0d 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 |