diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-31 20:59:14 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-31 20:59:14 +0100 |
| commit | e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch) | |
| tree | 23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /sci-geosciences/liblas | |
| parent | 908778078736bd36f7a60a2d576d415cb8e000fa (diff) | |
gentoo resync : 31.05.2021
Diffstat (limited to 'sci-geosciences/liblas')
| -rw-r--r-- | sci-geosciences/liblas/Manifest | 3 | ||||
| -rw-r--r-- | sci-geosciences/liblas/files/liblas-1.8.1-gcc11.patch | 34 | ||||
| -rw-r--r-- | sci-geosciences/liblas/liblas-1.8.1-r3.ebuild | 1 |
3 files changed, 37 insertions, 1 deletions
diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest index 02c9d06bfb8b..ca55eda3fbb1 100644 --- a/sci-geosciences/liblas/Manifest +++ b/sci-geosciences/liblas/Manifest @@ -4,7 +4,8 @@ AUX liblas-1.8.1-CVE-2018-20540.patch 1628 BLAKE2B c62bf39a1dd73ec8b1d82d9c4ae49 AUX liblas-1.8.1-boost-1.73.patch 1448 BLAKE2B adddc5aacf2961fbfdcc3a8eb82cf197e861ced0a027672ff1de5c70255e7a27d582143f63e1ed3b6e100838c08667787e01a39f4b74ae9ec17dd31ce50e66a9 SHA512 e4a71a3a229c075b4657e8ccca44682b29545ceafe5e2cfb4cdcf096f1813765219cf784c036964affd14a877ae0da95c96ed83a1ad96669634dbf67468cc237 AUX liblas-1.8.1-fix-debug.patch 600 BLAKE2B 6e8f94881f49058bb835e9978640721db4ef7a2b3e5b5a6780455146896d03ed49dcb952cdcb68c85cb47411f3abdd1a84e31200e49a50f5bdcc888464f6d791 SHA512 6e0cbce9451c0496b04da852c7b113c5a3d0b060a15675290c92b85d8c03cd59216e7fbda5d1bfe6c2a157c7777fa9f0d380034df709b20a318432ee756a4f56 AUX liblas-1.8.1-fix-overload-call.patch 641 BLAKE2B 3c4d95080a8fb33bf4652c9d2757a8c4e3bcc0eed910639dc1981fc08a9afbdc960c39f9bbcd06ca2e16091b8ca89d4deeb8424c77458f0d5161cb5c282937da SHA512 9a3b655567708b7c0e31234cb7ae92762923b5bbb13326be31f636ae6335fa726494e1be52c2e102bbf0b6702677fddf51276ce73bb996316b24377ad567a6c6 +AUX liblas-1.8.1-gcc11.patch 1332 BLAKE2B 1efbee0111a2368aa3820b1a6fb34b77c1bd1231fe381a892e0e2930089b101114f6b0b756cedc1a9c1858b094955227494ed1246df71b91b18be981065601a2 SHA512 588b65702580a851822f02068b9343d901c5794920f97120617c35cc2b4eb9ed71ee8c34351301a8a78b51bc36794e51414595e3ddfe5077c1371c873c3d99e8 AUX liblas-1.8.1-gdal-2.5.0.patch 1052 BLAKE2B 8686e4c02fccd1d638f7fc006a42ff7a84964bc236d8283bba24355352e2ef62a43eb8f3a44105cce516886c81cff43fb5be1162d3009b6d00a5f47425f01099 SHA512 3c784cedd45bf7fcd96438e22c5b8d672f91bcf08ce891d14aa2d6f9324f6106f8948b3002e8ceddbe03a949569b7e0a97087883eef4e79724fd33fd33d2558f DIST liblas-1.8.1.tar.gz 10734926 BLAKE2B dcd3dc043840857222e6b0a19dcb264ba34c09aa20cda9694ed182e040f9024c0b4a0e2359b1ba0da2337fa5b145aedb9a76a6dcea7ffd7cbcb125d0ae9af399 SHA512 0f8a0460e33c23c8a82eb42ab66ba69d4cc0680f6d320ce429653670f950f5724b88c5870800e0ab000e72cf0c08c55a4c468fe1b244140d867e2cb665f0f0b6 -EBUILD liblas-1.8.1-r3.ebuild 1393 BLAKE2B c66c7b17584d630539ed3f0c6e7f0e1d531fc2c4a2f16374779a97d281be3131c9f3544674f1c93591468589cacb42ebe60623b38fe11bbfc61f8e4ca9b5c14b SHA512 bdd272b2c3ae0753d48b61b0cca6df414530174f13ee964e4affc02728d58fd69dc5cee0f6122e0619a1b9635193e48363729175567e905649c1fbf7c5a1f0d4 +EBUILD liblas-1.8.1-r3.ebuild 1438 BLAKE2B ec12536642855ad304225d27c0b706e460183cdac0838edc9e56c4cd6992ac8f1e8b1cd28d538e916a9052885d47675f20b7e60c58bf97f50a5eca5f894730a8 SHA512 dc6738de079055c0f3a0a852ba159a9e894d403f4173b0bddb18286847a9d8b3886ff2ff4b9c5853f1e9a54b3741e213b7c86b73e60674c0cda602849c5cbe7f MISC metadata.xml 376 BLAKE2B 7e5aa05cd4b685c24db98a22655379d25294b99a9f25570f6ad8e91722ee6e09dd560cfc5af03efc2a467c82beb1120288b144fea35e7d09eab93cd154ed9039 SHA512 7f745f6aaec1b9233539d9cd868100daf1fc5dbde3aae27ee7ccfee681f0a2fa13f427921c1685bdac48f7937a60d9fa0f8db11af26e5af6a65522ea4fb64375 diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-gcc11.patch b/sci-geosciences/liblas/files/liblas-1.8.1-gcc11.patch new file mode 100644 index 000000000000..b279eb40f4cd --- /dev/null +++ b/sci-geosciences/liblas/files/liblas-1.8.1-gcc11.patch @@ -0,0 +1,34 @@ +https://github.com/libLAS/libLAS/commit/8c4985384453a2df7254f05688b83706723bad7b.patch +https://bugs.gentoo.org/789732 + +From 8c4985384453a2df7254f05688b83706723bad7b Mon Sep 17 00:00:00 2001 +From: FX Coudert <fxcoudert@gmail.com> +Date: Wed, 4 Oct 2017 11:51:23 +0200 +Subject: [PATCH] fix pointer comparison + +--- + src/gt_citation.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gt_citation.cpp b/src/gt_citation.cpp +index 65fce31a..8d3966bc 100644 +--- a/src/gt_citation.cpp ++++ b/src/gt_citation.cpp +@@ -155,7 +155,7 @@ char* ImagineCitationTranslation(char* psCitation, geokey_t keyID) + if(p1[0] == '\0' || p1[0] == '\n' || p1[0] == ' ') + p1 --; + p2 = p1 - 1; +- while( p2>0 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') ) ++ while( p2 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') ) + p2--; + if(p2 != p1 - 1) + p1 = p2; +@@ -198,7 +198,7 @@ char* ImagineCitationTranslation(char* psCitation, geokey_t keyID) + if(p1[0] == '\0' || p1[0] == '\n' || p1[0] == ' ') + p1 --; + char* p2 = p1 - 1; +- while( p2>0 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') ) ++ while( p2 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') ) + p2--; + if(p2 != p1 - 1) + p1 = p2; diff --git a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild index 0714f93b9b95..575896dad15f 100644 --- a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild +++ b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild @@ -34,6 +34,7 @@ PATCHES=( "${FILESDIR}"/${P}-CVE-2018-20540-fixup.patch # bug 698846 "${FILESDIR}"/${P}-fix-debug.patch # bug 668778 "${FILESDIR}"/${P}-boost-1.73.patch # bug 722878 + "${FILESDIR}"/${P}-gcc11.patch # bug 789732 ) src_prepare() { |